@@ -1,3 +1,7 @@

+0.1729

+    - dbi_option attribute is renamed to option, dbi_option is DEPRECATED!

+    - default_dbi_option is renamed to default_option, default_dbi_option

+      is DEPRECATED!

 0.1728

     - added {key => ..., value => ...} syntax to DBIx::Custom::Mapper map method

       ,and argument of string and code reference is DEPRECATED!

@@ -39,8 +39,8 @@ has [qw/connector dsn password quote user exclude_table user_table_info

             }

         }

     },

-    dbi_option => sub { {} },

-    default_dbi_option => sub {

+    option => sub { {} },

+    default_option => sub {

         {

             RaiseError => 1,

             PrintError => 0,

@@ -178,9 +178,9 @@ sub connect {

         my $dsn = $self->dsn;

         my $user = $self->user;

         my $password = $self->password;

-        my $dbi_option = {%{$self->dbi_options}, %{$self->dbi_option}};

+        my $option = $self->_option;

         my $connector = DBIx::Connector->new($dsn, $user, $password,

-          {%{$self->default_dbi_option} , %$dbi_option});

+          {%{$self->default_option} , %$option});

         $self->connector($connector);

     }

@@ -1347,11 +1347,8 @@ sub _connect {

       unless $dsn;

     my $user        = $self->user;

     my $password    = $self->password;

-    my $dbi_option = {%{$self->dbi_options}, %{$self->dbi_option}};

-    warn "dbi_options is DEPRECATED! use dbi_option instead\n"

-      if keys %{$self->dbi_options};

-    

-    $dbi_option = {%{$self->default_dbi_option}, %$dbi_option};

+    my $option = $self->_option;

+    $option = {%{$self->default_option}, %$option};

     # Connect

     my $dbh;

@@ -1360,7 +1357,7 @@ sub _connect {

             $dsn,

             $user,

             $password,

-            $dbi_option

+            $option

         );

     };

@@ -1404,6 +1401,16 @@ sub _need_tables {

     }

 }

+sub _option {

+    my $self = shift;

+    my $option = {%{$self->dbi_options}, %{$self->dbi_option}, %{$self->option}};

+    warn "dbi_options is DEPRECATED! use option instead\n"

+      if keys %{$self->dbi_options};

+    warn "dbi_option is DEPRECATED! use option instead\n"

+      if keys %{$self->dbi_option};

+    return $option;

+}

+

 sub _push_join {

     my ($self, $sql, $join, $join_tables) = @_;

@@ -1658,6 +1665,12 @@ has 'data_source';

 has dbi_options => sub { {} };

 has filter_check  => 1;

 has 'reserved_word_quote';

+has dbi_option => sub { {} };

+has default_dbi_option => sub {

+    warn "default_dbi_option is DEPRECATED! use default_option instead";

+    return shift->default_option;

+};

+

 # DEPRECATED!

 sub assign_param {

@@ -1949,7 +1962,7 @@ DBIx::Custom - Execute insert, update, delete, and select statement easily

         dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

-        dbi_option => {mysql_enable_utf8 => 1}

+        option => {mysql_enable_utf8 => 1}

     );

     # Insert 

@@ -2062,13 +2075,13 @@ Connection manager object. if C<connector> is set, you can get C<dbh>

 through connection manager. Conection manager object must have C<dbh> mehtod.

 This is L<DBIx::Connector> example. Please pass

-C<default_dbi_option> to L<DBIx::Connector> C<new> method.

+C<default_option> to L<DBIx::Connector> C<new> method.

     my $connector = DBIx::Connector->new(

         "dbi:mysql:database=$database",

         $user,

         $password,

-        DBIx::Custom->new->default_dbi_option

+        DBIx::Custom->new->default_option

     );

     my $dbi = DBIx::Custom->connect(connector => $connector);

@@ -2090,18 +2103,18 @@ Note that L<DBIx::Connector> must be installed.

 Data source name, used when C<connect> method is executed.

-=head2 C<dbi_option>

+=head2 C<option>

-    my $dbi_option = $dbi->dbi_option;

-    $dbi = $dbi->dbi_option($dbi_option);

+    my $option = $dbi->option;

+    $dbi = $dbi->option($option);

 L<DBI> option, used when C<connect> method is executed.

-Each value in option override the value of C<default_dbi_option>.

+Each value in option override the value of C<default_option>.

-=head2 C<default_dbi_option>

+=head2 C<default_option>

-    my $default_dbi_option = $dbi->default_dbi_option;

-    $dbi = $dbi->default_dbi_option($default_dbi_option);

+    my $default_option = $dbi->default_option;

+    $dbi = $dbi->default_option($default_option);

 L<DBI> default option, used when C<connect> method is executed,

 default to the following values.

@@ -2293,12 +2306,6 @@ Create column clause. The follwoing column clause is created.

 You can change separator by C<separator> attribute.

-    # Separator is double underbar

-    $dbi->separator('__');

-    

-    book.author as "book__author",

-    book.title as "book__title"

-

     # Separator is hyphen

     $dbi->separator('-');

@@ -2311,7 +2318,7 @@ You can change separator by C<separator> attribute.

         dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

-        dbi_option => {mysql_enable_utf8 => 1}

+        option => {mysql_enable_utf8 => 1}

     );

 Connect to the database and create a new L<DBIx::Custom> object.

@@ -2957,7 +2964,7 @@ Create column clause for myself. The follwoing column clause is created.

         dsn => "dbi:mysql:database=dbname",

         user => 'ken',

         password => '!LFKD%$&',

-        dbi_option => {mysql_enable_utf8 => 1}

+        option => {mysql_enable_utf8 => 1}

     );

 Create a new L<DBIx::Custom> object.

@@ -3489,6 +3496,8 @@ DEBUG output encoding. Default to UTF-8.

 L<DBIx::Custom>

     # Attribute methods

+    default_dbi_option # will be removed 2017/1/1

+    dbi_option # will be removed 2017/1/1

     data_source # will be removed at 2017/1/1

     dbi_options # will be removed at 2017/1/1

     filter_check # will be removed at 2017/1/1

@@ -56,13 +56,13 @@ Create C<order by> clause flexibly

         dsn => "dbi:mysql:database=bookshop",

         user => 'ken',

         password => '!LFKD%$&',

-        dbi_option => {mysql_enable_utf8 => 1}

+        option => {mysql_enable_utf8 => 1}

     );

 You can connect to database by C<connect> method.

 C<dsn> is data source name, C<user> is user name, C<password> is password.

-C<dbi_option> is L<DBI> option.

+C<option> is L<DBI> option.

 By default, the following option is set.

 Exeption is thrown when fatal error occur and commit mode is auto commit.

@@ -1729,7 +1729,9 @@ ok(!defined $result->default_filter);

 $result->default_filter('one');

 is($result->default_filter->(), 1);

-test 'dbi_option';

+test 'option';

+$dbi = DBIx::Custom->connect(option => {PrintError => 1});

+ok($dbi->dbh->{PrintError});

 $dbi = DBIx::Custom->connect(dbi_option => {PrintError => 1});

 ok($dbi->dbh->{PrintError});

 $dbi = DBIx::Custom->connect(dbi_options => {PrintError => 1});

@@ -116,7 +116,7 @@ test 'dbh';

         "dbi:mysql:database=$database",

         $user,

         $password,

-        DBIx::Custom->new->default_dbi_option

+        DBIx::Custom->new->default_option

     );

     my $dbi = DBIx::Custom->connect(connector => $connector);

@@ -182,7 +182,7 @@ use Scalar::Util 'blessed';

         user => $user,

         password => $password,

         dsn => "dbi:mysql:dbname=$database",

-        dbi_options => {AutoCommit => 0, mysql_enable_utf8 => 1}

+        option => {AutoCommit => 0, mysql_enable_utf8 => 1}

     );

     $dbi->connect;

     ok(!$dbi->dbh->{AutoCommit});

@@ -195,7 +195,7 @@ test 'fork';

         "dbi:mysql:database=$database",

         $user,

         $password,

-        DBIx::Custom->new->default_dbi_option

+        DBIx::Custom->new->default_option

     );

     my $dbi = DBIx::Custom->new(connector => $connector);

@@ -44,7 +44,7 @@ $dbi->execute('create table table1 (key1 varchar(255), key2 varchar(255))');

 test 'connector => 1';

 {

     my $dbi = DBIx::Custom->connect(dsn => $dsn, user => $user, password => $password,

-      dbi_option => {PrintError => 1}, connector => 1);

+      option => {PrintError => 1}, connector => 1);

     is(ref $dbi->connector, 'DBIx::Connector');

     ok($dbi->dbh->{PrintError});

     $dbi->delete_all(table => 'table1');