@@ -5,6 +5,8 @@

     - added EXPERIMENTAL get_column_info

     - added EXPERIMENTAL user_column_info attribute

       and each_column find column info in user_column_info if set.

+    - connector is automatically set to DBDx::Connector object

+      if connector is set to 1 when connect method is called.

 0.1716

     - fixed bugs when using DBD::Oracle.

     - added EXPERIMENTAL show_tables method.

@@ -164,7 +164,21 @@ sub column {

 }

 sub connect {

-    my $self = ref $_[0] ? shift : shift->new(@_);;

+    my $self = ref $_[0] ? shift : shift->new(@_);

+    

+    my $connector = $self->connector;

+    

+    if (!ref $connector && $connector) {

+        require DBIx::Connector;

+        

+        my $dsn = $self->dsn;

+        my $user = $self->user;

+        my $password = $self->password;

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

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

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

+        $self->connector($connector);

+    }

     # Connect

     $self->dbh;

@@ -559,7 +573,7 @@ sub get_column_info {

     return [

       sort {$a->{table} cmp $b->{table} || $a->{column} cmp $b->{column} }

-        @$$column_info];

+        @$column_info];

 }

 sub insert {

@@ -1038,6 +1052,7 @@ sub type_rule {

         # Into

         foreach my $i (1 .. 2) {

             my $into = "into$i";

+            my $exists_into = exists $type_rule->{$into};

             $type_rule->{$into} = _array_to_hash($type_rule->{$into});

             $self->{type_rule} = $type_rule;

             $self->{"_$into"} = {};

@@ -1045,6 +1060,7 @@ sub type_rule {

                 croak qq{type name of $into section must be lower case}

                   if $type_name =~ /[A-Z]/;

             }

+            

             $self->each_column(sub {

                 my ($dbi, $table, $column, $column_info) = @_;

@@ -1330,16 +1346,18 @@ sub _connect {

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

       if keys %{$self->dbi_options};

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

+    

     # Connect

-    my $dbh = eval {DBI->connect(

-        $dsn,

-        $user,

-        $password,

-        {

-            %{$self->default_dbi_option},

-            %$dbi_option

-        }

-    )};

+    my $dbh;

+    eval {

+        $dbh = DBI->connect(

+            $dsn,

+            $user,

+            $password,

+            $dbi_option

+        );

+    };

     # Connect error

     croak "$@ " . _subname if $@;

@@ -2010,14 +2028,24 @@ This is L<DBIx::Connector> example. Please pass

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

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

-        "dbi:mysql:database=$DATABASE",

-        $USER,

-        $PASSWORD,

+        "dbi:mysql:database=$database",

+        $user,

+        $password,

         DBIx::Custom->new->default_dbi_option

     );

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

+If C<connector> is set to 1 when connect method is called,

+L<DBIx::Connector> is automatically set to C<connector>

+

+    my $dbi = DBIx::Custom->connect(

+      dsn => $dsn, user => $user, password => $password, connector => 1);

+    

+    my $connector = $dbi->connector; # DBIx::Connector

+

+Note that L<DBIx::Connector> must be installed.

+

 =head2 C<dsn>

     my $dsn = $dbi->dsn;

@@ -77,6 +77,7 @@ my $insert_param;

 my $join;

 my $binary;

 my $user_table_info;

+my $user_column_info;

 require MyDBI1;

 {

@@ -2044,7 +2045,6 @@ eval { $dbi->execute("drop table $table2") };

 $dbi->execute($create_table1);

 $dbi->execute($create_table2);

 $dbi->separator('__');

-$DB::single = 1;

 $dbi->setup_model;

 $dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2});

 $dbi->insert(table => $table2, param => {$key1 => 1, $key3 => 3});

@@ -3322,11 +3322,14 @@ is_deeply($infos,

 test 'type_rule into';

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$user_column_info = $dbi->get_column_info(exclude_table => $dbi->exclude_table);

+

+

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { '2010-' . $_[0] }

@@ -3337,9 +3340,9 @@ $result = $dbi->select(table => $table1);

 like($result->one->{$key1}, qr/^2010-01-01/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => [

          [$date_typename, $datetime_typename] => sub {

@@ -3356,10 +3359,10 @@ like($row->{$key1}, qr/^2010-01-03/);

 like($row->{$key2}, qr/^2010-01-01 01:01:03/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

 $dbi->insert({$key1 => '2010-01-03', $key2 => '2010-01-01 01:01:03'}, table => $table1);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => [

         [$date_typename, $datetime_typename] => sub {

@@ -3378,10 +3381,10 @@ like($row->{$key1}, qr/^2010-01-03/);

 like($row->{$key2}, qr/^2010-01-01 01:01:03/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

 $dbi->insert({$key1 => '2010-01-03', $key2 => '2010-01-01 01:01:03'}, table => $table1);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => [

         [$date_typename, $datetime_typename] => sub {

@@ -3401,7 +3404,6 @@ like($row->{$key1}, qr/^2010-01-03/);

 like($row->{$key2}, qr/2010-01-01 01:01:03/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

 $dbi->register_filter(convert => sub {

@@ -3409,6 +3411,7 @@ $dbi->register_filter(convert => sub {

     $value =~ s/02/03/;

     return $value;

 });

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => 'convert',

@@ -3423,9 +3426,9 @@ like($result->fetch->[0], qr/^2010-03-03/);

 test 'type_rule and filter order';

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { my $v = shift || ''; $v =~ s/4/5/; return $v }

@@ -3448,9 +3451,9 @@ like($result->fetch_first->[0], qr/^2010-01-09/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }

@@ -3461,6 +3464,7 @@ $dbi->type_rule(

 );

 $dbi->insert({$key1 => '2010-01-03'}, table => $table1);

 $result = $dbi->select(table => $table1);

+$dbi->user_column_info($user_column_info);

 $result->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/6/; return $v }

@@ -3474,9 +3478,9 @@ like($result->fetch_first->[0], qr/^2010-01-09/);

 test 'type_rule_off';

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/5/; return $v }

@@ -3490,9 +3494,9 @@ $result = $dbi->select(table => $table1, type_rule_off => 1);

 like($result->type_rule_off->fetch->[0], qr/^2010-01-03/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }

@@ -3506,9 +3510,9 @@ $result = $dbi->select(table => $table1, type_rule_off => 1);

 like($result->one->{$key1}, qr/^2010-01-04/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/4/5/; return $v }

@@ -3522,9 +3526,9 @@ $result = $dbi->select(table => $table1);

 like($result->one->{$key1}, qr/^2010-01-05/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/4/5/; return $v }

@@ -3538,10 +3542,10 @@ $result = $dbi->select(table => $table1);

 like($result->fetch->[0], qr/2010-01-05/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

 $dbi->register_filter(ppp => sub { my $v = shift || ''; $v =~ s/3/4/; return $v });

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => 'ppp'

@@ -3559,7 +3563,6 @@ eval{$dbi->type_rule(

 like($@, qr/not registered/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

 eval {

@@ -3581,9 +3584,9 @@ eval {

 like($@, qr/lower/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/4/5/; return $v }

@@ -3598,9 +3601,9 @@ $result->type_rule_off;

 like($result->one->{$key1}, qr/^2010-01-04/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/4/; return $v },

@@ -3664,9 +3667,9 @@ like($row->{$key1}, qr/^2010-01-03/);

 like($row->{$key2}, qr/^2010-01-01 01:01:03/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/4/; return $v },

@@ -3678,9 +3681,9 @@ $result->filter($key1 => sub { my $v = shift || ''; $v =~ s/4/5/; return $v });

 like($result->one->{$key1}, qr/^2010-01-05/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     from1 => {

         $date_datatype => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }

@@ -3692,9 +3695,9 @@ $result->filter($key1 => sub { my $v = shift || ''; $v =~ s/4/5/; return $v });

 like($result->fetch->[0], qr/^2010-01-05/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }

@@ -3716,9 +3719,9 @@ $result = $dbi->select(table => $table1);

 like($result->type_rule_on->fetch_first->[0], qr/^2010-01-07/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }

@@ -3740,9 +3743,9 @@ $result = $dbi->select(table => $table1);

 like($result->type_rule1_on->fetch_first->[0], qr/^2010-01-07/);

 $dbi = DBIx::Custom->connect;

-$dbi->user_table_info($user_table_info);

 eval { $dbi->execute("drop table $table1") };

 $dbi->execute($create_table1_type);

+$dbi->user_column_info($user_column_info);

 $dbi->type_rule(

     into1 => {

         $date_typename => sub { my $v = shift || ''; $v =~ s/3/5/; return $v }

@@ -1,21 +1,27 @@

 use Test::More;

 use strict;

 use warnings;

+use utf8;

 use FindBin;

 use DBIx::Custom;

 my $dbi;

+my $dsn;

+my $args;

+my $user = 'dbix_custom';

+my $password = 'dbix_custom';

+my $database = 'dbix_custom';

-plan skip_all => 'mysql private test' unless -f "$FindBin::Bin/run/mysql.run"

-  && eval { $dbi = DBIx::Custom->connect; 1 };

+$dsn = "dbi:mysql:database=$database";

+$args = {dsn => $dsn, user => $user, password => $password,};

+

+plan skip_all => 'mysql private test' unless -f "$FindBin::Bin/run/mysql2.run"

+  && eval { $dbi = DBIx::Custom->connect($args); 1 };

 plan 'no_plan';

 $SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

-# user password database

-our ($user, $password, $database) = qw/appuser 123456 usertest/;

-

 require DBIx::Connector;

 # Function for test name

@@ -44,8 +50,8 @@ for (1 .. 200) {

         password => $password

     );

     $dbi->query_builder;

-    $dbi->create_model(table => $table1);

-    $dbi->create_model(table => $table2);

+    $dbi->create_model(table => 'table1');

+    $dbi->create_model(table => 'table2');

 }

 test 'limit';

@@ -104,62 +110,6 @@ $rows = $dbi->select(

 is_deeply($rows, [{key1 => 1, key2 => 4}]);

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

-test 'type_rule';

-$dbi = DBIx::Custom->connect(

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

-    user => $user,

-    password => $password

-);

-eval{$dbi->execute("create table date_test (date DATE, datetime DATETIME)")};

-$dbi->each_column(

-    sub {

-        my ($self, $table, $column, $column_info) = @_;

-    }

-);

-

-$dbi->type_rule(

-    into1 => {

-        date=> sub {

-            my $date = shift;

-            $date =~ s/aaaaa//g;

-            return $date;

-        },

-        datetime => sub {

-            my $date = shift;

-            $date =~ s/ccccc//g;

-            return $date;

-        },

-    },

-    from1 => {

-        # DATE

-        9 => sub {

-                my $date = shift;

-                $date .= 'bbbbb';

-                return $date;

-        },

-        # DATETIME or TIMPESTANM

-        11 => sub {

-                my $date = shift;

-                $date .= 'ddddd';

-                return $date;

-        }

-    }

-);

-

-$dbi->insert(

-    {

-        date => 'aaaaa2010-aaaaa11-12aaaaa',

-        datetime => '2010-11ccccc-12 10:ccccc55:56'

-    },

-    table => 'date_test'

-);

-is_deeply(

-    $dbi->select(table => 'date_test')->fetch,

-    ['2010-11-12bbbbb', '2010-11-12 10:55:56ddddd']

-);

-

-$dbi->execute("drop table date_test");

-

 test 'dbh';

 {

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

@@ -0,0 +1,65 @@

+use Test::More;

+use strict;

+use warnings;

+use utf8;

+

+use FindBin;

+use DBIx::Custom;

+

+my $dbi;

+my $dsn;

+my $args;

+my $user = 'dbix_custom';

+my $password = 'dbix_custom';

+my $database = 'dbix_custom';

+

+$dsn = "dbi:mysql:database=$database";

+$args = {dsn => $dsn, user => $user, password => $password,};

+

+plan skip_all => 'mysql private test' unless -f "$FindBin::Bin/run/mysql2.run"

+  && eval { $dbi = DBIx::Custom->connect($args); 1 };

+plan 'no_plan';

+

+$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+

+

+require DBIx::Connector;

+

+# Function for test name

+sub test { print "# $_[0]\n" }

+

+# Varialbes for tests

+my $dbname;

+my $rows;

+my $result;

+

+$dbi = DBIx::Custom->connect(

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

+    user => $user,

+    password => $password

+);

+eval { $dbi->execute('drop table table1') };

+$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);

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

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

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

+    $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2});

+    die "Can't fork" unless defined (my $pid = fork);

+

+    if ($pid) {

+        # Parent

+        my $result = $dbi->select(table => 'table1');

+        is_deeply($result->fetch_hash_first, {key1 => 1, key2 => 2});

+    }

+    else {

+        # Child

+        my $result = $dbi->select(table => 'table1');

+        die "Not OK" unless $result->fetch_hash_first->{key1} == 1;

+    }

+}

+