@@ -16,7 +16,7 @@ use DBIx::Custom;

             Callbacks => {

               connected => sub {

                   shift->do(

-                      "ALTER SESSION SET NLS_DATE_FORMAT = 'RR-MM-DD HH24:MI:SS'"

+                      "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"

                   );

                   return;

               },

@@ -14,6 +14,67 @@ plan skip_all => $ENV{DBIX_CUSTOM_SKIP_MESSAGE} || 'common.t is always skipped'

 plan 'no_plan';

+# Constant

+my $table1 = $dbi->table1;

+my $table2 = $dbi->table2;

+my $table2_alias = $dbi->table2_alias;

+my $table3 = $dbi->table3;

+my $key1 = $dbi->key1;

+my $key2 = $dbi->key2;

+my $key3 = $dbi->key3;

+my $key4 = $dbi->key4;

+my $key5 = $dbi->key5;

+my $key6 = $dbi->key6;

+my $key7 = $dbi->key7;

+my $key8 = $dbi->key8;

+my $key9 = $dbi->key9;

+my $key10 = $dbi->key10;

+my $create_table1 = $dbi->create_table1;

+my $create_table1_2 = $dbi->create_table1_2;

+my $create_table1_type = $dbi->create_table1_type;

+my $create_table1_highperformance = $dbi->create_table1_highperformance;

+my $create_table2 = $dbi->create_table2;

+my $create_table2_2 = $dbi->create_table2_2;

+my $create_table3 = $dbi->create_table3;

+my $create_table_reserved = $dbi->create_table_reserved;

+my $q = substr($dbi->quote, 0, 1);

+my $p = substr($dbi->quote, 1, 1) || $q;

+my $date_typename = $dbi->date_typename;

+my $datetime_typename = $dbi->datetime_typename;

+my $date_datatype = $dbi->date_datatype;

+my $datetime_datatype = $dbi->datetime_datatype;

+

+# Variables

+my $builder;

+my $datas;

+my $sth;

+my $source;

+my @sources;

+my $select_source;

+my $insert_source;

+my $update_source;

+my $param;

+my $params;

+my $sql;

+my $result;

+my $row;

+my @rows;

+my $rows;

+my $query;

+my @queries;

+my $select_query;

+my $insert_query;

+my $update_query;

+my $ret_val;

+my $infos;

+my $model;

+my $model2;

+my $where;

+my $update_param;

+my $insert_param;

+my $join;

+my $binary;

+

 use MyDBI1;

 {

     package MyDBI4;

@@ -28,8 +89,8 @@ use MyDBI1;

         $self->include_model(

             MyModel2 => [

-                'table1',

-                {class => 'table2', name => 'table2'}

+                $table1,

+                {class => $table2, name => $table2}

             ]

         );

     }

@@ -143,549 +204,56 @@ use MyDBI1;

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

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

-# Constant

-my $table1 = $dbi->table1;

-my $table2 = $dbi->table2;

-my $table2_alias = $dbi->table2_alias;

-my $table3 = $dbi->table3;

-my $key1 = $dbi->key1;

-my $key2 = $dbi->key2;

-my $key3 = $dbi->key3;

-my $key4 = $dbi->key4;

-my $key5 = $dbi->key5;

-my $key6 = $dbi->key6;

-my $key7 = $dbi->key7;

-my $key8 = $dbi->key8;

-my $key9 = $dbi->key9;

-my $key10 = $dbi->key10;

-my $create_table1 = $dbi->create_table1;

-my $create_table1_2 = $dbi->create_table1_2;

-my $create_table1_type = $dbi->create_table1_type;

-my $create_table1_highperformance = $dbi->create_table1_highperformance;

-my $create_table2 = $dbi->create_table2;

-my $create_table2_2 = $dbi->create_table2_2;

-my $create_table3 = $dbi->create_table3;

-my $create_table_reserved = $dbi->create_table_reserved;

-my $q = substr($dbi->quote, 0, 1);

-my $p = substr($dbi->quote, 1, 1) || $q;

-my $date_typename = $dbi->date_typename;

-my $datetime_typename = $dbi->datetime_typename;

-my $date_datatype = $dbi->date_datatype;

-my $datetime_datatype = $dbi->datetime_datatype;

-

-# Variables

-my $builder;

-my $datas;

-my $sth;

-my $source;

-my @sources;

-my $select_source;

-my $insert_source;

-my $update_source;

-my $param;

-my $params;

-my $sql;

-my $result;

-my $row;

-my @rows;

-my $rows;

-my $query;

-my @queries;

-my $select_query;

-my $insert_query;

-my $update_query;

-my $ret_val;

-my $infos;

-my $model;

-my $model2;

-my $where;

-my $update_param;

-my $insert_param;

-my $join;

-my $binary;

-

-

-test 'type_rule into';

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

-$dbi->execute($create_table1_type);

+# Create table

 $dbi = DBIx::Custom->connect;

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

-$dbi->execute($create_table1_type);

-$dbi->show_tables;

+$dbi->execute($create_table1);

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

+$model->insert({$key1 => 1, $key2 => 2});

+is_deeply($model->select->all, [{$key1 => 1, $key2 => 2}]);

-$DB::single = 1;

+test 'DBIx::Custom::Result test';

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

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

+$dbi->insert(table => $table1, param => {$key1 => 3, $key2 => 4});

+$source = "select $key1, $key2 from $table1";

+$query = $dbi->create_query($source);

+$result = $dbi->execute($query);

-__END__

+@rows = ();

+while (my $row = $result->fetch) {

+    push @rows, [@$row];

+}

+is_deeply(\@rows, [[1, 2], [3, 4]], "fetch");

-$dbi->type_rule(

-    into1 => {

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

-    }

-);

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

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

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

+$result = $dbi->execute($query);

+@rows = ();

+while (my $row = $result->fetch_hash) {

+    push @rows, {%$row};

+}

+is_deeply(\@rows, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}], "fetch_hash");

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    into1 => [

-         [$date_typename, $datetime_typename] => sub {

-            my $value = shift;

-            $value =~ s/02/03/g;

-            return $value;

-         }

-    ]

-);

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

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

-$row = $result->one;

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

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

+$result = $dbi->execute($query);

+$rows = $result->fetch_all;

+is_deeply($rows, [[1, 2], [3, 4]], "fetch_all");

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

-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->type_rule(

-    into1 => [

-        [$date_typename, $datetime_typename] => sub {

-            my $value = shift;

-            $value =~ s/02/03/g;

-            return $value;

-        }

-    ]

-);

-$result = $dbi->execute(

-    "select * from $table1 where $key1 = :$key1 and $key2 = :$table1.$key2",

-    param => {$key1 => '2010-01-03', "$table1.$key2" => '2010-01-01 01:01:02'}

-);

-$row = $result->one;

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

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

+$result = $dbi->execute($query);

+$rows = $result->fetch_hash_all;

+is_deeply($rows, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}], "all");

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

-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->type_rule(

-    into1 => [

-        [$date_typename, $datetime_typename] => sub {

-            my $value = shift;

-            $value =~ s/02/03/g;

-            return $value;

-        }

-    ]

-);

-$result = $dbi->execute(

-    "select * from $table1 where $key1 = :$key1 and $key2 = :$table1.$key2",

-    param => {$key1 => '2010-01-02', "$table1.$key2" => '2010-01-01 01:01:02'},

-    table => $table1

-);

-$row = $result->one;

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

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

+test 'Insert query return value';

+$source = "insert into $table1 {insert_param $key1 $key2}";

+$query = $dbi->execute($source, {}, query => 1);

+$ret_val = $dbi->execute($query, param => {$key1 => 1, $key2 => 2});

+ok($ret_val);

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

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

-$dbi->execute($create_table1_type);

-$dbi->register_filter(convert => sub {

-    my $value = shift || '';

-    $value =~ s/02/03/;

-    return $value;

-});

-$dbi->type_rule(

-    from1 => {

-        $date_datatype => 'convert',

-    },

-    into1 => {

-        $date_typename => 'convert',

-    }

-);

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

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

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

-

-test 'type_rule and filter order';

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    into1 => {

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

-    },

-    into2 => {

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

-    },

-    from1 => {

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

-    },

-    from2 => {

-        $date_datatype => sub { my $v = shift || ''; $v =~ s/7/8/; return $v }

-    }

-);

-$dbi->insert({$key1 => '2010-01-03'}, 

-  table => $table1, filter => {$key1 => sub { my $v = shift || ''; $v =~ s/3/4/; return $v }});

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

-$result->filter($key1 => sub { my $v = shift || ''; $v =~ s/8/9/; return $v });

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

-

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    from2 => {

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

-    },

-);

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

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

-$result->type_rule(

-    from1 => {

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

-    },

-    from2 => {

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

-    }

-);

-$result->filter($key1 => sub { my $v = shift || ''; $v =~ s/8/9/; return $v });

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

-

-test 'type_rule_off';

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    into1 => {

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

-    }

-);

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

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    into1 => {

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

-    }

-);

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

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    into1 => {

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

-    }

-);

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

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    into1 => {

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

-    }

-);

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

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

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

-

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

-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->type_rule(

-    into1 => {

-        $date_typename => 'ppp'

-    }

-);

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

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

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

-

-eval{$dbi->type_rule(

-    into1 => {

-        $date_typename => 'pp'

-    }

-)};

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

-

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

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

-$dbi->execute($create_table1_type);

-eval {

-    $dbi->type_rule(

-        from1 => {

-            Date => sub { $_[0] * 2 },

-        }

-    );

-};

-like($@, qr/lower/);

-

-eval {

-    $dbi->type_rule(

-        into1 => {

-            Date => sub { $_[0] * 2 },

-        }

-    );

-};

-like($@, qr/lower/);

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-    into1 => {

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

-    }

-);

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

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

-$result->type_rule_off;

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

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

-    },

-);

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

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

-$result->type_rule(

-    from1 => {

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

-    }

-);

-$row = $result->one;

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

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

-

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

-$result->type_rule(

-    from1 => {

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

-    }

-);

-$row = $result->one;

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

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

-

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

-$result->type_rule(

-    from1 => {

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

-    }

-);

-$row = $result->one;

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

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

-

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

-$result->type_rule(

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

-);

-$row = $result->one;

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

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

-

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

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

-$result->type_rule(

-    from1 => [$date_datatype => 'five']

-);

-$row = $result->one;

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

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

-

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

-$result->type_rule(

-    from1 => [$date_datatype => undef]

-);

-$row = $result->one;

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-);

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

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

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    from1 => {

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

-    },

-);

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

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

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    into1 => {

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

-    },

-    into2 => {

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

-    },

-    from1 => {

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

-    },

-    from2 => {

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

-    }

-);

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

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

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

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    into1 => {

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

-    },

-    into2 => {

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

-    },

-    from1 => {

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

-    },

-    from2 => {

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

-    }

-);

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

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

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

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

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

-

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

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

-$dbi->execute($create_table1_type);

-$dbi->type_rule(

-    into1 => {

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

-    },

-    into2 => {

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

-    },

-    from1 => {

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

-    },

-    from2 => {

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

-    }

-);

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

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

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

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

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

-

-

-

-# Create table

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

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

-$dbi->execute($create_table1);

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

-$model->insert({$key1 => 1, $key2 => 2});

-is_deeply($model->select->all, [{$key1 => 1, $key2 => 2}]);

-

-test 'DBIx::Custom::Result test';

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

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

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

-$source = "select $key1, $key2 from $table1";

-$query = $dbi->create_query($source);

-$result = $dbi->execute($query);

-

-@rows = ();

-while (my $row = $result->fetch) {

-    push @rows, [@$row];

-}

-is_deeply(\@rows, [[1, 2], [3, 4]], "fetch");

-

-$result = $dbi->execute($query);

-@rows = ();

-while (my $row = $result->fetch_hash) {

-    push @rows, {%$row};

-}

-is_deeply(\@rows, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}], "fetch_hash");

-

-$result = $dbi->execute($query);

-$rows = $result->fetch_all;

-is_deeply($rows, [[1, 2], [3, 4]], "fetch_all");

-

-$result = $dbi->execute($query);

-$rows = $result->fetch_hash_all;

-is_deeply($rows, [{$key1 => 1, $key2 => 2}, {$key1 => 3, $key2 => 4}], "all");

-

-test 'Insert query return value';

-$source = "insert into $table1 {insert_param $key1 $key2}";

-$query = $dbi->execute($source, {}, query => 1);

-$ret_val = $dbi->execute($query, param => {$key1 => 1, $key2 => 2});

-ok($ret_val);

-

-test 'Direct query';

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

-$insert_source = "insert into $table1 {insert_param $key1 $key2}";

-$dbi->execute($insert_source, param => {$key1 => 1, $key2 => 2});

-$result = $dbi->execute("select * from $table1");

-$rows = $result->all;

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

+test 'Direct query';

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

+$insert_source = "insert into $table1 {insert_param $key1 $key2}";

+$dbi->execute($insert_source, param => {$key1 => 1, $key2 => 2});

+$result = $dbi->execute("select * from $table1");

+$rows = $result->all;

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

 test 'Filter basic';

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

@@ -1486,82 +1054,30 @@ $dbi->execute($create_table2);

 $dbi->register_filter(twice => sub { $_[0] * 2 });

 $dbi->register_filter(three_times => sub { $_[0] * 3 });

 $dbi->apply_filter(

-    $table1, $key2 => {out => 'twice', in => 'twice'}

-);

-$dbi->apply_filter(

-    $table2, $key3 => {out => 'three_times', in => 'three_times'}

-);

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

-$dbi->insert(table => $table2, param => {$key1 => 5, $key3 => 6}, filter => {$key3 => undef});

-$result = $dbi->select(

-     table => [$table1, $table2],

-     column => [$key2, $key3],

-     where => {"$table1.$key2" => 1, "$table2.$key3" => 2}, relation => {"$table1.$key1" => "$table2.$key1"});

-

-$result->filter({$key2 => 'twice'});

-$rows   = $result->all;

-is_deeply($rows, [{$key2 => 4, $key3 => 18}], "select : join");

-

-$result = $dbi->select(

-     table => [$table1, $table2],

-     column => [$key2, $key3],

-     where => {$key2 => 1, $key3 => 2}, relation => {"$table1.$key1" => "$table2.$key1"});

-

-$result->filter({$key2 => 'twice'});

-$rows   = $result->all;

-is_deeply($rows, [{$key2 => 4, $key3 => 18}], "select : join : omit");

-

-test 'each_column';

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

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

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

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

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

-$dbi->execute($create_table1_type);

-$dbi->execute($create_table2);

-

-$infos = [];

-$dbi->each_column(sub {

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

-    

-    if ($table =~ /^table\d/) {

-         my $info = [$table, $column, $cinfo->{COLUMN_NAME}];

-         push @$infos, $info;

-    }

-});

-$infos = [sort { $a->[0] cmp $b->[0] || $a->[1] cmp $b->[1] } @$infos];

-is_deeply($infos, 

-    [

-        [$table1, $key1, $key1],

-        [$table1, $key2, $key2],

-        [$table2, $key1, $key1],

-        [$table2, $key3, $key3]

-    ]

-    

-);

-test 'each_table';

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

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

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

-$dbi->execute($create_table2);

-$dbi->execute($create_table1_type);

-

-$infos = [];

-$dbi->each_table(sub {

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

-    

-    if ($table =~ /^table\d/) {

-         my $info = [$table, $table_info->{TABLE_NAME}];

-         push @$infos, $info;

-    }

-});

-$infos = [sort { $a->[0] cmp $b->[0] || $a->[1] cmp $b->[1] } @$infos];

-is_deeply($infos, 

-    [

-        [$table1, $table1],

-        [$table2, $table2],

-    ]

+    $table1, $key2 => {out => 'twice', in => 'twice'}

+);

+$dbi->apply_filter(

+    $table2, $key3 => {out => 'three_times', in => 'three_times'}

 );

+$dbi->insert(table => $table1, param => {$key1 => 5, $key2 => 2}, filter => {$key2 => undef});

+$dbi->insert(table => $table2, param => {$key1 => 5, $key3 => 6}, filter => {$key3 => undef});

+$result = $dbi->select(

+     table => [$table1, $table2],

+     column => [$key2, $key3],

+     where => {"$table1.$key2" => 1, "$table2.$key3" => 2}, relation => {"$table1.$key1" => "$table2.$key1"});

+

+$result->filter({$key2 => 'twice'});

+$rows   = $result->all;

+is_deeply($rows, [{$key2 => 4, $key3 => 18}], "select : join");

+

+$result = $dbi->select(

+     table => [$table1, $table2],

+     column => [$key2, $key3],

+     where => {$key2 => 1, $key3 => 2}, relation => {"$table1.$key1" => "$table2.$key1"});

+

+$result->filter({$key2 => 'twice'});

+$rows   = $result->all;

+is_deeply($rows, [{$key2 => 4, $key3 => 18}], "select : join : omit");

 test 'connect super';

 $dbi = DBIx::Custom->connect;

@@ -2114,10 +1630,6 @@ $where->map(

 is_deeply($where->param, {"$table1.id" => [$dbi->not_exists, $dbi->not_exists], "$table1.author" => '%Ken%',

   "$table1.price" => 1900});

-test 'dbi_option default';

-$dbi = DBIx::Custom->new;

-is_deeply($dbi->dbi_option, {});

-

 test 'register_tag_processor';

 $dbi = DBIx::Custom->connect;

 $dbi->register_tag_processor(

@@ -2428,7 +1940,7 @@ like($@, qr/must be/);

 test 'columns';

 use MyDBI1;

 $dbi = MyDBI1->connect;

-$model = $dbi->model($table1);

+$model = $dbi->model(lc $table1);

 test 'model delete_at';

@@ -3366,482 +2878,958 @@ eval{$builder->build_query("{a}")};

 like($@, qr/\QPlaceholder count/, "placeholder count is invalid");

-test 'Default tag Error case';

-eval{$builder->build_query("{= }")};

-like($@, qr/Column name must be specified in tag "{= }"/, "basic '=' : key not exist");

+test 'Default tag Error case';

+eval{$builder->build_query("{= }")};

+like($@, qr/Column name must be specified in tag "{= }"/, "basic '=' : key not exist");

+

+eval{$builder->build_query("{in }")};

+like($@, qr/Column name and count of values must be specified in tag "{in }"/, "in : key not exist");

+

+eval{$builder->build_query("{in a}")};

+like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

+     "in : key not exist");

+

+eval{$builder->build_query("{in a r}")};

+like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

+     "in : key not exist");

+

+test 'variouse source';

+$source = "a {= b} c \\{ \\} {= \\{} {= \\}} d";

+$query = $builder->build_query($source);

+is($query->sql, 'a b = ? c { } { = ? } = ? d', "basic : 1");

+

+$source = "abc";

+$query = $builder->build_query($source);

+is($query->sql, 'abc', "basic : 2");

+

+$source = "{= a}";

+$query = $builder->build_query($source);

+is($query->sql, 'a = ?', "only tag");

+

+$source = "000";

+$query = $builder->build_query($source);

+is($query->sql, '000', "contain 0 value");

+

+$source = "a {= b} }";

+eval{$builder->build_query($source)};

+like($@, qr/unexpected "}"/, "error : 1");

+

+$source = "a {= {}";

+eval{$builder->build_query($source)};

+like($@, qr/unexpected "{"/, "error : 2");

+

+test 'select() wrap option';

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

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

+$dbi->execute($create_table1);

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

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

+$rows = $dbi->select(

+    table => $table1,

+    column => $key1,

+    wrap => ["select * from (", ") as t where $key1 = 1"]

+)->all;

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

+

+eval {

+$dbi->select(

+    table => $table1,

+    column => $key1,

+    wrap => 'select * from ('

+)

+};

+like($@, qr/array/);

+

+test 'select() sqlfilter option';

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

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

+$dbi->execute($create_table1);

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

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

+$rows = $dbi->select(

+    table => $table1,

+    column => $key1,

+    sqlfilter => sub {

+        my $sql = shift;

+        $sql = "select * from ( $sql ) as t where $key1 = 1";

+        return $sql;

+    }

+)->all;

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

+

+test 'dbi method from model';

+$dbi = MyDBI9->connect;

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

+$dbi->execute($create_table1);

+$dbi->setup_model;

+$model = $dbi->model($table1);

+eval{$model->execute("select * from $table1")};

+ok(!$@);

+

+test 'column table option';

+$dbi = MyDBI9->connect;

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

+$dbi->execute($create_table1);

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

+$dbi->execute($create_table2);

+$dbi->setup_model;

+$dbi->execute("insert into $table1 ($key1, $key2) values (1, 2)");

+$dbi->execute("insert into $table2 ($key1, $key3) values (1, 4)");

+$model = $dbi->model($table1);

+$result = $model->select(

+    column => [

+        $model->column($table2, {alias => $table2_alias})

+    ],

+    where => {"$table2_alias.$key3" => 4}

+);

+is_deeply($result->one, 

+          {"$table2_alias.$key1" => 1, "$table2_alias.$key3" => 4});

+

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

+$result = $model->select(

+    column => [

+        $model->column($table2, {alias => $table2_alias})

+    ],

+    where => {"$table2_alias.$key3" => 4}

+);

+is_deeply($result->one, 

+          {"${table2_alias}__$key1" => 1, "${table2_alias}__$key3" => 4});

+

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

+$result = $model->select(

+    column => [

+        $model->column($table2, {alias => $table2_alias})

+    ],

+    where => {"$table2_alias.$key3" => 4}

+);

+is_deeply($result->one, 

+          {"$table2_alias-$key1" => 1, "$table2_alias-$key3" => 4});

+

+test 'create_model';

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

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

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

+$dbi->execute($create_table1);

+$dbi->execute($create_table2);

+

+$dbi->create_model(

+    table => $table1,

+    join => [

+       "left outer join $table2 on $table1.$key1 = $table2.$key1"

+    ],

+    primary_key => [$key1]

+);

+$model2 = $dbi->create_model(

+    table => $table2

+);

+$dbi->create_model(

+    table => $table3,

+    filter => [

+        $key1 => {in => sub { uc $_[0] }}

+    ]

+);

+$dbi->setup_model;

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

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

+$model = $dbi->model($table1);

+$result = $model->select(

+    column => [$model->mycolumn, $model->column($table2)],

+    where => {"$table1.$key1" => 1}

+);

+is_deeply($result->one,

+          {$key1 => 1, $key2 => 2, "$table2.$key1" => 1, "$table2.$key3" => 3});

+is_deeply($model2->select->one, {$key1 => 1, $key3 => 3});

+

+test 'model method';

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

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

+$dbi->execute($create_table2);

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

+$model = $dbi->create_model(

+    table => $table2

+);

+$model->method(foo => sub { shift->select(@_) });

+is_deeply($model->foo->one, {$key1 => 1, $key3 => 3});

+

+test 'update_param';

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

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

+$dbi->execute($create_table1_2);

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5});

+$dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

+

+$param = {$key2 => 11};

+$update_param = $dbi->update_param($param);

+$sql = <<"EOS";

+update $table1 $update_param

+where $key1 = 1

+EOS

+$dbi->execute($sql, param => $param);

+$result = $dbi->execute("select * from $table1 order by $key1", table => $table1);

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 3, $key4 => 4, $key5 => 5},

+                  {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

+                  "basic");

+

+

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

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

+$dbi->execute($create_table1_2);

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5});

+$dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

+

+$param = {$key2 => 11, $key3 => 33};

+$update_param = $dbi->update_param($param);

+$sql = <<"EOS";

+update $table1 $update_param

+where $key1 = 1

+EOS

+$dbi->execute($sql, param => $param);

+$result = $dbi->execute("select * from $table1 order by $key1", table => $table1);

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 33, $key4 => 4, $key5 => 5},

+                  {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

+                  "basic");

+

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

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

+$dbi->execute($create_table1_2);

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5});

+$dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

+

+$param = {$key2 => 11, $key3 => 33};

+$update_param = $dbi->update_param($param, {no_set => 1});

+$sql = <<"EOS";

+update $table1 set $update_param

+where $key1 = 1

+EOS

+$dbi->execute($sql, param => $param);

+$result = $dbi->execute("select * from $table1 order by $key1", table => $table1);

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 33, $key4 => 4, $key5 => 5},

+                  {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

+                  "update param no_set");

+

+            

+eval { $dbi->update_param({";" => 1}) };

+like($@, qr/not safety/);

+

-eval{$builder->build_query("{in }")};

-like($@, qr/Column name and count of values must be specified in tag "{in }"/, "in : key not exist");

+test 'update_param';

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

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

+$dbi->execute($create_table1_2);

+$dbi->insert(table => $table1, param => {$key1 => 1, $key2 => 2, $key3 => 3, $key4 => 4, $key5 => 5});

+$dbi->insert(table => $table1, param => {$key1 => 6, $key2 => 7, $key3 => 8, $key4 => 9, $key5 => 10});

-eval{$builder->build_query("{in a}")};

-like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

-     "in : key not exist");

+$param = {$key2 => 11};

+$update_param = $dbi->assign_param($param);

+$sql = <<"EOS";

+update $table1 set $update_param

+where $key1 = 1

+EOS

+$dbi->execute($sql, param => $param, table => $table1);

+$result = $dbi->execute("select * from $table1 order by $key1");

+$rows   = $result->all;

+is_deeply($rows, [{$key1 => 1, $key2 => 11, $key3 => 3, $key4 => 4, $key5 => 5},

+                  {$key1 => 6, $key2 => 7,  $key3 => 8, $key4 => 9, $key5 => 10}],

+                  "basic");

-eval{$builder->build_query("{in a r}")};

-like($@, qr/\QColumn name and count of values must be specified in tag "{in }"/,

-     "in : key not exist");

+test 'join';

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

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

+$dbi->execute($create_table1);

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

+$dbi->insert(table => $table1, param => {$key1 => 3, $key2 => 4});

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

+$dbi->execute($create_table2);

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

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

+$dbi->execute("create table $table3 ($key3 int, $key4 int)");

+$dbi->insert(table => $table3, param => {$key3 => 5, $key4 => 4});

+$rows = $dbi->select(

+    table => $table1,

+    column => "$table1.$key1 as ${table1}_$key1, $table2.$key1 as ${table2}_$key1, $key2, $key3",

+    where   => {"$table1.$key2" => 2},

+    join  => ["left outer join $table2 on $table1.$key1 = $table2.$key1"]

+)->all;

+is_deeply($rows, [{"${table1}_$key1" => 1, "${table2}_$key1" => 1, $key2 => 2, $key3 => 5}]);

-test 'variouse source';

-$source = "a {= b} c \\{ \\} {= \\{} {= \\}} d";

-$query = $builder->build_query($source);

-is($query->sql, 'a b = ? c { } { = ? } = ? d', "basic : 1");

+$rows = $dbi->select(

+    table => $table1,

+    where   => {$key1 => 1},

+    join  => ["left outer join $table2 on $table1.$key1 = $table2.$key1"]

+)->all;

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

-$source = "abc";

-$query = $builder->build_query($source);

-is($query->sql, 'abc', "basic : 2");

+eval {

+    $rows = $dbi->select(

+        table => $table1,

+        column => "$table1.$key1 as ${table1}_$key1, $table2.$key1 as ${table2}_$key1, $key2, $key3",

+        where   => {"$table1.$key2" => 2},

+        join  => {"$table1.$key1" => "$table2.$key1"}

+    );

+};

+like ($@, qr/array/);

-$source = "{= a}";

-$query = $builder->build_query($source);

-is($query->sql, 'a = ?', "only tag");

+$rows = $dbi->select(

+    table => $table1,

+    where   => {$key1 => 1},

+    join  => ["left outer join $table2 on $table1.$key1 = $table2.$key1",

+              "left outer join $table3 on $table2.$key3 = $table3.$key3"]

+)->all;

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

-$source = "000";

-$query = $builder->build_query($source);

-is($query->sql, '000', "contain 0 value");

+$rows = $dbi->select(

+    column => "$table3.$key4 as ${table3}__$key4",

+    table => $table1,

+    where   => {"$table1.$key1" => 1},

+    join  => ["left outer join $table2 on $table1.$key1 = $table2.$key1",

+              "left outer join $table3 on $table2.$key3 = $table3.$key3"]

+)->all;

+is_deeply($rows, [{"${table3}__$key4" => 4}]);

-$source = "a {= b} }";

-eval{$builder->build_query($source)};

-like($@, qr/unexpected "}"/, "error : 1");

+$rows = $dbi->select(

+    column => "$table1.$key1 as ${table1}__$key1",

+    table => $table1,

+    where   => {"$table3.$key4" => 4},

+    join  => ["left outer join $table2 on $table1.$key1 = $table2.$key1",

+              "left outer join $table3 on $table2.$key3 = $table3.$key3"]

+)->all;

+is_deeply($rows, [{"${table1}__$key1" => 1}]);

+

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

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

+$dbi->execute($create_table1);

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

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

+$dbi->execute($create_table2);

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

+$rows = $dbi->select(

+    table => $table1,

+    column => "${q}$table1$p.${q}$key1$p as ${q}${table1}_$key1$p, ${q}$table2$p.${q}$key1$p as ${q}${table2}_$key1$p, ${q}$key2$p, ${q}$key3$p",

+    where   => {"$table1.$key2" => 2},

+    join  => ["left outer join ${q}$table2$p on ${q}$table1$p.${q}$key1$p = ${q}$table2$p.${q}$key1$p"],

+)->all;

+is_deeply($rows, [{"${table1}_$key1" => 1, "${table2}_$key1" => 1, $key2 => 2, $key3 => 5}],

+          'quote');

-$source = "a {= {}";

-eval{$builder->build_query($source)};

-like($@, qr/unexpected "{"/, "error : 2");

-test 'select() wrap option';

 $dbi = DBIx::Custom->connect;

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

 $dbi->execute($create_table1);

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

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

+$sql = <<"EOS";

+left outer join (

+  select * from $table1 as t1

+  where t1.$key2 = (

+    select max(t2.$key2) from $table1 as t2

+    where t1.$key1 = t2.$key1

+  )

+) as latest_$table1 on $table1.$key1 = latest_$table1.$key1

+EOS

+$join = [$sql];

 $rows = $dbi->select(

     table => $table1,

-    column => $key1,

-    wrap => ["select * from (", ") as t where $key1 = 1"]

+    column => "latest_$table1.$key1 as latest_${table1}__$key1",

+    join  => $join

 )->all;

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

+is_deeply($rows, [{"latest_${table1}__$key1" => 1}]);

-eval {

-$dbi->select(

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

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

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

+$dbi->execute($create_table1);

+$dbi->execute($create_table2);

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

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

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

+$result = $dbi->select(

     table => $table1,

-    column => $key1,

-    wrap => 'select * from ('

-)

-};

-like($@, qr/array/);

+    join => [

+        "left outer join $table2 on $table2.$key2 = '4' and $table1.$key1 = $table2.$key1"

+    ]

+);

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

+$result = $dbi->select(

+    table => $table1,

+    column => [{$table2 => [$key3]}],

+    join => [

+        "left outer join $table2 on $table2.$key3 = '4' and $table1.$key1 = $table2.$key1"

+    ]

+);

+is_deeply($result->all, [{"$table2.$key3" => 4}]);

+$result = $dbi->select(

+    table => $table1,

+    column => [{$table2 => [$key3]}],

+    join => [

+        "left outer join $table2 on $table1.$key1 = $table2.$key1 and $table2.$key3 = '4'"

+    ]

+);

+is_deeply($result->all, [{"$table2.$key3" => 4}]);

+

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

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

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

+$dbi->execute($create_table1);

+$dbi->execute($create_table2);

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

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

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

+$result = $dbi->select(

+    table => $table1,

+    column => [{$table2 => [$key3]}],

+    join => [

+        {

+            clause => "left outer join $table2 on $table2.$key3 = '4' and $table1.$key1 = $table2.$key1",

+            table => [$table1, $table2]

+        }

+    ]

+);

+is_deeply($result->all, [{"$table2.$key3" => 4}]);

+

+test 'Model class';

+use MyDBI1;

+$dbi = MyDBI1->connect;

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

+$dbi->execute($create_table1);

+$model = $dbi->model($table1);

+$model->insert({$key1 => 'a', $key2 => 'b'});

+is_deeply($model->list->all, [{$key1 => 'a', $key2 => 'b'}], 'basic');

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

+$dbi->execute($create_table2);

+$model = $dbi->model($table2);

+$model->insert({$key1 => 'a'});

+is_deeply($model->list->all, [{$key1 => 'a', $key3 => undef}], 'basic');

+is($dbi->models->{$table1}, $dbi->model($table1));

+is($dbi->models->{$table2}, $dbi->model($table2));

+

+$dbi = MyDBI4->connect;

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

+$dbi->execute($create_table1);

+$model = $dbi->model($table1);

+$model->insert({$key1 => 'a', $key2 => 'b'});

+is_deeply($model->list->all, [{$key1 => 'a', $key2 => 'b'}], 'basic');

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

+$dbi->execute($create_table2);

+$model = $dbi->model($table2);

+$model->insert({$key1 => 'a'});

+is_deeply($model->list->all, [{$key1 => 'a', $key3 => undef}], 'basic');

+

+$dbi = MyDBI5->connect;

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

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

+$dbi->execute($create_table1);

+$dbi->execute($create_table2);

+$model = $dbi->model($table2);

+$model->insert({$key1 => 'a'});

+is_deeply($model->list->all, [{$key1 => 'a', $key3 => undef}], 'include all model');

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

+$model = $dbi->model($table1);

+is_deeply($model->list->all, [{$key1 => 1, $key2 => undef}], 'include all model');

+

+test 'primary_key';

+use MyDBI1;

+$dbi = MyDBI1->connect;

+$model = $dbi->model($table1);

+$model->primary_key([$key1, $key2]);

+is_deeply($model->primary_key, [$key1, $key2]);

+

+test 'columns';

+use MyDBI1;

+$dbi = MyDBI1->connect;

+$model = $dbi->model($table1);

+$model->columns([$key1, $key2]);

+is_deeply($model->columns, [$key1, $key2]);

-test 'select() sqlfilter option';

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

+test 'setup_model';

+use MyDBI1;

+$dbi = MyDBI1->connect;

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

-$dbi->execute($create_table1);

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

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

-$rows = $dbi->select(

-    table => $table1,

-    column => $key1,

-    sqlfilter => sub {

-        my $sql = shift;

-        $sql = "select * from ( $sql ) as t where $key1 = 1";

-        return $sql;

-    }

-)->all;

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

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

-test 'dbi method from model';

-$dbi = MyDBI9->connect;

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

 $dbi->execute($create_table1);

+$dbi->execute($create_table2);

 $dbi->setup_model;

-$model = $dbi->model($table1);

-eval{$model->execute("select * from $table1")};

-ok(!$@);

+is_deeply([sort @{$dbi->model($table1)->columns}], [$key1, $key2]);

+is_deeply([sort @{$dbi->model($table2)->columns}], [$key1, $key3]);

-test 'column table option';

-$dbi = MyDBI9->connect;

+test 'each_column';

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

+eval { $dbi->execute("drop table ${q}table$p") };

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

-$dbi->execute($create_table1);

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

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

+$dbi->execute($create_table1_type);

 $dbi->execute($create_table2);

-$dbi->setup_model;

-$dbi->execute("insert into $table1 ($key1, $key2) values (1, 2)");

-$dbi->execute("insert into $table2 ($key1, $key3) values (1, 4)");

-$model = $dbi->model($table1);

-$result = $model->select(

-    column => [

-        $model->column($table2, {alias => $table2_alias})

-    ],

-    where => {"$table2_alias.$key3" => 4}

+

+$infos = [];

+$dbi->each_column(sub {

+    my ($self, $table, $column, $cinfo) = @_;

+    

+    if ($table =~ /^table\d/i) {

+         my $info = [$table, $column, $cinfo->{COLUMN_NAME}];

+         push @$infos, $info;

+    }

+});

+$infos = [sort { $a->[0] cmp $b->[0] || $a->[1] cmp $b->[1] } @$infos];

+$DB::single = 1;

+is_deeply($infos, 

+    [

+        [$table1, $key1, $key1],

+        [$table1, $key2, $key2],

+        [$table2, $key1, $key1],

+        [$table2, $key3, $key3]

+    ]

+    

 );

-is_deeply($result->one, 

-          {"$table2_alias.$key1" => 1, "$table2_alias.$key3" => 4});

+test 'each_table';

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

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

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

+$dbi->execute($create_table2);

+$dbi->execute($create_table1_type);

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

-$result = $model->select(

-    column => [

-        $model->column($table2, {alias => $table2_alias})

-    ],

-    where => {"$table2_alias.$key3" => 4}

+$infos = [];

+$dbi->each_table(sub {

+    my ($self, $table, $table_info) = @_;

+    

+    if ($table =~ /^table\d/i) {

+         my $info = [$table, $table_info->{TABLE_NAME}];

+         push @$infos, $info;

+    }

+});

+$infos = [sort { $a->[0] cmp $b->[0] || $a->[1] cmp $b->[1] } @$infos];

+is_deeply($infos, 

+    [

+        [$table1, $table1],

+        [$table2, $table2],

+    ]

 );

-is_deeply($result->one, 

-          {"${table2_alias}__$key1" => 1, "${table2_alias}__$key3" => 4});

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

-$result = $model->select(

-    column => [

-        $model->column($table2, {alias => $table2_alias})

-    ],

-    where => {"$table2_alias.$key3" => 4}

+test 'type_rule into';

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

+$dbi->execute($create_table1_type);

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

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

+$dbi->execute($create_table1_type);

+

+$dbi->type_rule(

+    into1 => {

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

+    }

 );

-is_deeply($result->one, 

-          {"$table2_alias-$key1" => 1, "$table2_alias-$key3" => 4});

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

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

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

-test 'create_model';

 $dbi = DBIx::Custom->connect;

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

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

-$dbi->execute($create_table1);

-$dbi->execute($create_table2);

+$dbi->execute($create_table1_type);

+$dbi->type_rule(

+    into1 => [

+         [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+         }

+    ]

+);

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

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

+$row = $result->one;

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

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

-$dbi->create_model(

-    table => $table1,

-    join => [

-       "left outer join $table2 on $table1.$key1 = $table2.$key1"

-    ],

-    primary_key => [$key1]

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

+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->type_rule(

+    into1 => [

+        [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+        }

+    ]

 );

-$model2 = $dbi->create_model(

-    table => $table2

+$result = $dbi->execute(

+    "select * from $table1 where $key1 = :$key1 and $key2 = :$table1.$key2",

+    param => {$key1 => '2010-01-03', "$table1.$key2" => '2010-01-01 01:01:02'}

 );

-$dbi->create_model(

-    table => $table3,

-    filter => [

-        $key1 => {in => sub { uc $_[0] }}

+$row = $result->one;

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

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

+

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

+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->type_rule(

+    into1 => [

+        [$date_typename, $datetime_typename] => sub {

+            my $value = shift;

+            $value =~ s/02/03/g;

+            return $value;

+        }

     ]

 );

-$dbi->setup_model;

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

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

-$model = $dbi->model($table1);

-$result = $model->select(

-    column => [$model->mycolumn, $model->column($table2)],

-    where => {"$table1.$key1" => 1}

+$result = $dbi->execute(

+    "select * from $table1 where $key1 = :$key1 and $key2 = :$table1.$key2",

+    param => {$key1 => '2010-01-02', "$table1.$key2" => '2010-01-01 01:01:02'},

+    table => $table1

+);