@@ -19,6 +19,8 @@ use DBIx::Custom;

     sub create_table1_2 {'create table table1 (key1 varchar(255), key2 varchar(255), '

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255)) engine=InnoDB;' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime) engine=InnoDB;;' }

+    sub create_table1_highperformance { "create table table1 (ab varchar(255), bc varchar(255), "

+      . "ik varchar(255), hi varchar(255), ui varchar(255), pq varchar(255), dc varchar(255)) engine=InnoDB;" }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255)) engine=InnoDB;' }

     sub create_table2_2 { "create table table2 (key1 varchar(255), key2 varchar(255), key3 varchar(255)) engine=InnoDB" }

     sub create_table3 { "create table table3 (key1 varchar(255), key2 varchar(255), key3 varchar(255)) engine=InnoDB" }

@@ -18,6 +18,8 @@ use DBIx::Custom;

     sub create_table1_2 {'create table table1 (key1 varchar(255), key2 varchar(255), '

      . 'key3 varchar(255), key4 varchar(255), key5 varchar(255));' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 varchar(255));' }

+    sub create_table1_highperformance { "create table table1 (ab varchar(255), bc varchar(255), "

+      . "ik varchar(255), hi varchar(255), ui varchar(255), pq varchar(255), dc varchar(255));" }

     sub create_table2 { 'create table table2 (key1 varchar(255), key3 varchar(255));' }

     sub create_table2_2 { "create table table2 (key1 varchar(255), key2 varchar(255), key3 varchar(255))" }

     sub create_table3 { "create table table3 (key1 varchar(255), key2 varchar(255), key3 varchar(255))" }

@@ -13,6 +13,7 @@ use DBIx::Custom;

     sub create_table1 { 'create table table1 (key1, key2);' }

     sub create_table1_2 {'create table table1 (key1, key2, key3, key4, key5);' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime);' }

+    sub create_table1_highperformance { "create table table1 (ab, bc, ik, hi, ui, pq, dc);" }

     sub create_table2 { 'create table table2 (key1, key3);' }

     sub create_table2_2 { "create table table2 (key1, key2, key3)" }

     sub create_table3 { "create table table3 (key1, key2, key3)" }

@@ -12,6 +12,9 @@ use DBIx::Custom;

     sub create_table1 { 'create table table1 (key1, key2);' }

     sub create_table1_2 {'create table table1 (key1, key2, key3, key4, key5);' }

     sub create_table1_type { 'create table table1 (key1 Date, key2 datetime);' }

+    

+    sub create_table1_highperformance { "create table table1 (ab, bc, ik, hi, ui, pq, dc);" }

+    

     sub create_table2 { 'create table table2 (key1, key3);' }

     sub create_table2_2 { "create table table2 (key1, key2, key3)" }

     sub create_table3 { "create table table3 (key1, key2, key3)" }

@@ -146,6 +146,7 @@ sub test { print "# $_[0]\n" }

 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;

@@ -2671,4 +2672,325 @@ $param = $dbi->map_param(

 );

 is_deeply($param, {'book.price' => '%a'});

+test 'order';

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

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

+$dbi->execute($create_table1);

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

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

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

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

+my $order = $dbi->order;

+$order->prepend('key1', 'key2 desc');

+$result = $dbi->select(table => 'table1', append => "$order");

+is_deeply($result->all, [{key1 => 1, key2 => 3}, {key1 => 1, key2 => 1},

+  {key1 => 2, key2 => 4}, {key1 => 2, key2 => 2}]);

+$order->prepend('key1 desc');

+$result = $dbi->select(table => 'table1', append => "$order");

+is_deeply($result->all, [{key1 => 2, key2 => 4}, {key1 => 2, key2 => 2},

+  {key1 => 1, key2 => 3}, {key1 => 1, key2 => 1}]);

+

+$order = $dbi->order;

+$order->prepend(['table1-key1'], [qw/table1-key2 desc/]);

+$result = $dbi->select(table => 'table1',

+  column => [[key1 => 'table1-key1'], [key2 => 'table1-key2']],

+  append => "$order");

+is_deeply($result->all, [{'table1-key1' => 1, 'table1-key2' => 3},

+  {'table1-key1' => 1, 'table1-key2' => 1},

+  {'table1-key1' => 2, 'table1-key2' => 4},

+  {'table1-key1' => 2, 'table1-key2' => 2}]);

+

+test 'tag_parse';

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

+$dbi->tag_parse(0);

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

+$dbi->execute($create_table1);

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

+eval {$dbi->execute("select * from table1 where {= key1}", {key1 => 1})};

+ok($@);

+

+test 'last_sql';

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

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

+$dbi->execute($create_table1);

+$dbi->execute('select * from table1');

+is($dbi->last_sql, 'select * from table1;');

+

+eval{$dbi->execute("aaa")};

+is($dbi->last_sql, 'aaa;');

+

+test 'DBIx::Custom header';

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

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

+$dbi->execute($create_table1);

+$result = $dbi->execute('select key1 as h1, key2 as h2 from table1');

+is_deeply($result->header, [qw/h1 h2/]);

+

+test 'Named placeholder :name(operater) syntax';

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

+

+$source = "select * from table1 where :key1{=} and :key2{=}";

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

+$rows = $result->all;

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

+

+$source = "select * from table1 where :key1{ = } and :key2{=}";

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

+$rows = $result->all;

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

+

+$source = "select * from table1 where :key1{<} and :key2{=}";

+$result = $dbi->execute($source, param => {key1 => 5, key2 => 2});

+$rows = $result->all;

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

+

+$source = "select * from table1 where :table1.key1{=} and :table1.key2{=}";

+$result = $dbi->execute(

+    $source,

+    param => {'table1.key1' => 1, 'table1.key2' => 1},

+    filter => {'table1.key2' => sub { $_[0] * 2 }}

+);

+$rows = $result->all;

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

+

+test 'high perfomance way';

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

+$dbi->execute($create_table1_highperformance);

+$rows = [

+    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

+    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

+];

+{

+    my $query;

+    foreach my $row (@$rows) {

+      $query ||= $dbi->insert($row, table => 'table1', query => 1);

+      $dbi->execute($query, $row, filter => {ab => sub { $_[0] * 2 }});

+    }

+    is_deeply($dbi->select(table => 'table1')->all,

+      [

+          {ab => 2, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

+          {ab => 2, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

+      ]

+    );

+}

+

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

+$dbi->execute($create_table1_highperformance);

+$rows = [

+    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

+    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

+];

+{

+    my $query;

+    my $sth;

+    foreach my $row (@$rows) {

+      $query ||= $dbi->insert($row, table => 'table1', query => 1);

+      $sth ||= $query->sth;

+      $sth->execute(map { $row->{$_} } sort keys %$row);

+    }

+    is_deeply($dbi->select(table => 'table1')->all,

+      [

+          {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

+          {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

+      ]

+    );

+}

+

+test 'result';

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

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

+$dbi->execute($create_table1);

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

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

+

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

+@rows = ();

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

+    push @rows, [@$row];

+}

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

+

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

+@rows = ();

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

+    push @rows, {%$row};

+}

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

+

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

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

+$dbi->execute($create_table1);

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

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

+

+test 'fetch_all';

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

+$rows = $result->fetch_all;

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

+

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

+$rows = $result->fetch_hash_all;

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

+

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

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

+$result->filter({key1 => 'three_times'});

+

+$rows = $result->fetch_all;

+is_deeply($rows, [[3, 2], [9, 4]], "array");

+

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

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

+$result->filter({key1 => 'three_times'});

+$rows = $result->fetch_hash_all;

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

+

+test "query_builder";

+$datas = [

+    # Basic tests

+    {   name            => 'placeholder basic',

+        source            => "a {?  k1} b {=  k2} {<> k3} {>  k4} {<  k5} {>= k6} {<= k7} {like k8}", ,

+        sql_expected    => "a ? b k2 = ? k3 <> ? k4 > ? k5 < ? k6 >= ? k7 <= ? k8 like ?;",

+        columns_expected   => [qw/k1 k2 k3 k4 k5 k6 k7 k8/]

+    },

+    {

+        name            => 'placeholder in',

+        source            => "{in k1 3};",

+        sql_expected    => "k1 in (?, ?, ?);",

+        columns_expected   => [qw/k1 k1 k1/]

+    },

+    

+    # Table name

+    {

+        name            => 'placeholder with table name',

+        source            => "{= a.k1} {= a.k2}",

+        sql_expected    => "a.k1 = ? a.k2 = ?;",

+        columns_expected  => [qw/a.k1 a.k2/]

+    },

+    {   

+        name            => 'placeholder in with table name',

+        source            => "{in a.k1 2} {in b.k2 2}",

+        sql_expected    => "a.k1 in (?, ?) b.k2 in (?, ?);",

+        columns_expected  => [qw/a.k1 a.k1 b.k2 b.k2/]

+    },

+    {

+        name            => 'not contain tag',

+        source            => "aaa",

+        sql_expected    => "aaa;",

+        columns_expected  => [],

+    }

+];

+

+for (my $i = 0; $i < @$datas; $i++) {

+    my $data = $datas->[$i];

+    my $builder = DBIx::Custom->new->query_builder;

+    my $query = $builder->build_query($data->{source});

+    is($query->{sql}, $data->{sql_expected}, "$data->{name} : sql");

+    is_deeply($query->columns, $data->{columns_expected}, "$data->{name} : columns");

+}

+

+$builder = DBIx::Custom->new->query_builder;

+$ret_val = $builder->register_tag(

+    p => sub {

+        my @args = @_;

+        

+        my $expand    = "? $args[0] $args[1]";

+        my $columns = [2];

+        return [$expand, $columns];

+    }

+);

+

+$query = $builder->build_query("{p a b}");

+is($query->{sql}, "? a b;", "register_tag sql");

+is_deeply($query->{columns}, [2], "register_tag columns");

+isa_ok($ret_val, 'DBIx::Custom::QueryBuilder');

+

+$builder = DBIx::Custom->new->query_builder;

+

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

+like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

+

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

+like($@, qr/\QTag "a" is not registered/, "tag not exist");

+

+$builder->register_tag({

+    q => 'string'

+});

+

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

+like($@, qr/Tag "q" must be sub reference/, "tag not code ref");

+

+$builder->register_tag({

+   r => sub {} 

+});

+

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

+like($@, qr/\QTag "r" must return [STRING, ARRAY_REFERENCE]/, "tag return noting");

+

+$builder->register_tag({

+   s => sub { return ["a", ""]} 

+});

+

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

+like($@, qr/\QTag "s" must return [STRING, ARRAY_REFERENCE]/, "tag return not array columns");

+

+$builder->register_tag(

+    t => sub {return ["a", []]}

+);

+

+

+test 'General error case';

+$builder = DBIx::Custom->new->query_builder;

+$builder->register_tag(

+    a => sub {

+        return ["? ? ?", ['']];

+    }

+);

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

+

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

+

 1;

@@ -203,383 +203,6 @@ $dbi = DBIx::Custom->connect;

-test 'order';

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

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

-$dbi->execute("create table table1 (key1, key2)");

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

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

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

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

-my $order = $dbi->order;

-$order->prepend('key1', 'key2 desc');

-$result = $dbi->select(table => 'table1', append => "$order");

-is_deeply($result->all, [{key1 => 1, key2 => 3}, {key1 => 1, key2 => 1},

-  {key1 => 2, key2 => 4}, {key1 => 2, key2 => 2}]);

-$order->prepend('key1 desc');

-$result = $dbi->select(table => 'table1', append => "$order");

-is_deeply($result->all, [{key1 => 2, key2 => 4}, {key1 => 2, key2 => 2},

-  {key1 => 1, key2 => 3}, {key1 => 1, key2 => 1}]);

-

-$order = $dbi->order;

-$order->prepend(['table1-key1'], [qw/table1-key2 desc/]);

-$result = $dbi->select(table => 'table1',

-  column => [[key1 => 'table1-key1'], [key2 => 'table1-key2']],

-  append => "$order");

-is_deeply($result->all, [{'table1-key1' => 1, 'table1-key2' => 3},

-  {'table1-key1' => 1, 'table1-key2' => 1},

-  {'table1-key1' => 2, 'table1-key2' => 4},

-  {'table1-key1' => 2, 'table1-key2' => 2}]);

-

-test 'tag_parse';

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

-$dbi->tag_parse(0);

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

-$dbi->execute("create table table1 (key1, key2)");

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

-eval {$dbi->execute("select * from table1 where {= key1}", {key1 => 1})};

-ok($@);

-

-test 'last_sql';

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

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

-$dbi->execute("create table table1 (key1, key2)");

-$dbi->execute('select * from table1');

-is($dbi->last_sql, 'select * from table1;');

-

-eval{$dbi->execute("aaa")};

-is($dbi->last_sql, 'aaa;');

-

-test 'DBIx::Custom header';

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

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

-$dbi->execute("create table table1 (key1, key2)");

-$result = $dbi->execute('select key1 as h1, key2 as h2 from table1');

-is_deeply($result->header, [qw/h1 h2/]);

-

-test 'Named placeholder :name(operater) syntax';

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

-

-$source = "select * from table1 where :key1{=} and :key2{=}";

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

-$rows = $result->all;

-is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

-

-$source = "select * from table1 where :key1{ = } and :key2{=}";

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

-$rows = $result->all;

-is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

-

-$source = "select * from table1 where :key1{<} and :key2{=}";

-$result = $dbi->execute($source, param => {key1 => 5, key2 => 2});

-$rows = $result->all;

-is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

-

-$source = "select * from table1 where :table1.key1{=} and :table1.key2{=}";

-$result = $dbi->execute(

-    $source,

-    param => {'table1.key1' => 1, 'table1.key2' => 1},

-    filter => {'table1.key2' => sub { $_[0] * 2 }}

-);

-$rows = $result->all;

-is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}]);

-

-test 'high perfomance way';

-$dbi->execute('drop table table1');

-$dbi->execute("create table table1 (ab, bc, ik, hi, ui, pq, dc);");

-$rows = [

-    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

-    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

-];

-{

-    my $query;

-    foreach my $row (@$rows) {

-      $query ||= $dbi->insert($row, table => 'table1', query => 1);

-      $dbi->execute($query, $row, filter => {ab => sub { $_[0] * 2 }});

-    }

-    is_deeply($dbi->select(table => 'table1')->all,

-      [

-          {ab => 2, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

-          {ab => 2, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

-      ]

-    );

-}

-

-$dbi->execute('drop table table1');

-$dbi->execute("create table table1 (ab, bc, ik, hi, ui, pq, dc);");

-$rows = [

-    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

-    {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

-];

-{

-    my $query;

-    my $sth;

-    foreach my $row (@$rows) {

-      $query ||= $dbi->insert($row, table => 'table1', query => 1);

-      $sth ||= $query->sth;

-      $sth->execute(map { $row->{$_} } sort keys %$row);

-    }

-    is_deeply($dbi->select(table => 'table1')->all,

-      [

-          {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 7},

-          {ab => 1, bc => 2, ik => 3, hi => 4, ui => 5, pq => 6, dc => 8},

-      ]

-    );

-}

-

-test 'result';

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

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

-$dbi->execute($create_table1);

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

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

-

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

-@rows = ();

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

-    push @rows, [@$row];

-}

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

-

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

-@rows = ();

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

-    push @rows, {%$row};

-}

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

-

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

-$row = $result->fetch_first;

-is_deeply($row, [1, 2], "row");

-$row = $result->fetch;

-ok(!$row, "finished");

-

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

-$row = $result->fetch_hash_first;

-is_deeply($row, {key1 => 1, key2 => 2}, "row");

-$row = $result->fetch_hash;

-ok(!$row, "finished");

-

-$dbi->execute('create table table2 (key1, key2);');

-$result = $dbi->select(table => 'table2');

-$row = $result->fetch_hash_first;

-ok(!$row, "no row fetch");

-

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

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

-$dbi->execute($create_table1);

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

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

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

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

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

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

-$rows = $result->fetch_multi(2);

-is_deeply($rows, [[1, 2],

-                  [3, 4]], "fetch_multi first");

-$rows = $result->fetch_multi(2);

-is_deeply($rows, [[5, 6],

-                  [7, 8]], "fetch_multi secound");

-$rows = $result->fetch_multi(2);

-is_deeply($rows, [[9, 10]], "fetch_multi third");

-$rows = $result->fetch_multi(2);

-ok(!$rows);

-

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

-eval {$result->fetch_multi};

-like($@, qr/Row count must be specified/, "Not specified row count");

-

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

-$rows = $result->fetch_hash_multi(2);

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

-                  {key1 => 3, key2 => 4}], "fetch_multi first");

-$rows = $result->fetch_hash_multi(2);

-is_deeply($rows, [{key1 => 5, key2 => 6},

-                  {key1 => 7, key2 => 8}], "fetch_multi secound");

-$rows = $result->fetch_hash_multi(2);

-is_deeply($rows, [{key1 => 9, key2 => 10}], "fetch_multi third");

-$rows = $result->fetch_hash_multi(2);

-ok(!$rows);

-

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

-eval {$result->fetch_hash_multi};

-like($@, qr/Row count must be specified/, "Not specified row count");

-

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

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

-$dbi->execute($create_table1);

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

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

-

-test 'fetch_all';

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

-$rows = $result->fetch_all;

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

-

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

-$rows = $result->fetch_hash_all;

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

-

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

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

-$result->filter({key1 => 'three_times'});

-

-$rows = $result->fetch_all;

-is_deeply($rows, [[3, 2], [9, 4]], "array");

-

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

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

-$result->filter({key1 => 'three_times'});

-$rows = $result->fetch_hash_all;

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

-

-test "query_builder";

-$datas = [

-    # Basic tests

-    {   name            => 'placeholder basic',

-        source            => "a {?  k1} b {=  k2} {<> k3} {>  k4} {<  k5} {>= k6} {<= k7} {like k8}", ,

-        sql_expected    => "a ? b k2 = ? k3 <> ? k4 > ? k5 < ? k6 >= ? k7 <= ? k8 like ?;",

-        columns_expected   => [qw/k1 k2 k3 k4 k5 k6 k7 k8/]

-    },

-    {

-        name            => 'placeholder in',

-        source            => "{in k1 3};",

-        sql_expected    => "k1 in (?, ?, ?);",

-        columns_expected   => [qw/k1 k1 k1/]

-    },

-    

-    # Table name

-    {

-        name            => 'placeholder with table name',

-        source            => "{= a.k1} {= a.k2}",

-        sql_expected    => "a.k1 = ? a.k2 = ?;",

-        columns_expected  => [qw/a.k1 a.k2/]

-    },

-    {   

-        name            => 'placeholder in with table name',

-        source            => "{in a.k1 2} {in b.k2 2}",

-        sql_expected    => "a.k1 in (?, ?) b.k2 in (?, ?);",

-        columns_expected  => [qw/a.k1 a.k1 b.k2 b.k2/]

-    },

-    {

-        name            => 'not contain tag',

-        source            => "aaa",

-        sql_expected    => "aaa;",

-        columns_expected  => [],

-    }

-];

-

-for (my $i = 0; $i < @$datas; $i++) {

-    my $data = $datas->[$i];

-    my $builder = DBIx::Custom->new->query_builder;

-    my $query = $builder->build_query($data->{source});

-    is($query->{sql}, $data->{sql_expected}, "$data->{name} : sql");

-    is_deeply($query->columns, $data->{columns_expected}, "$data->{name} : columns");

-}

-

-$builder = DBIx::Custom->new->query_builder;

-$ret_val = $builder->register_tag(

-    p => sub {

-        my @args = @_;

-        

-        my $expand    = "? $args[0] $args[1]";

-        my $columns = [2];

-        return [$expand, $columns];

-    }

-);

-

-$query = $builder->build_query("{p a b}");

-is($query->{sql}, "? a b;", "register_tag sql");

-is_deeply($query->{columns}, [2], "register_tag columns");

-isa_ok($ret_val, 'DBIx::Custom::QueryBuilder');

-

-$builder = DBIx::Custom->new->query_builder;

-

-eval{$builder->build_query('{? }')};

-like($@, qr/\QColumn name must be specified in tag "{? }"/, "? not arguments");

-

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

-like($@, qr/\QTag "a" is not registered/, "tag not exist");

-

-$builder->register_tag({

-    q => 'string'

-});

-

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

-like($@, qr/Tag "q" must be sub reference/, "tag not code ref");

-

-$builder->register_tag({

-   r => sub {} 

-});

-

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

-like($@, qr/\QTag "r" must return [STRING, ARRAY_REFERENCE]/, "tag return noting");

-

-$builder->register_tag({

-   s => sub { return ["a", ""]} 

-});

-

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

-like($@, qr/\QTag "s" must return [STRING, ARRAY_REFERENCE]/, "tag return not array columns");

-

-$builder->register_tag(

-    t => sub {return ["a", []]}

-);

-

-

-test 'General error case';

-$builder = DBIx::Custom->new->query_builder;

-$builder->register_tag(

-    a => sub {

-        return ["? ? ?", ['']];

-    }

-);

-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");

-

-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");

@@ -1501,6 +1124,71 @@ $result = $dbi->execute("select * from ${q}table$p");

 $rows   = $result->all;

 is_deeply($rows, [], "reserved word");

+test 'finish statement handle';

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

+$dbi->execute($create_table1);

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

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

+

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

+$row = $result->fetch_first;

+is_deeply($row, [1, 2], "row");

+$row = $result->fetch;

+ok(!$row, "finished");

+

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

+$row = $result->fetch_hash_first;

+is_deeply($row, {key1 => 1, key2 => 2}, "row");

+$row = $result->fetch_hash;

+ok(!$row, "finished");

+

+$dbi->execute('create table table2 (key1, key2);');

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

+$row = $result->fetch_hash_first;

+ok(!$row, "no row fetch");

+

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

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

+$dbi->execute($create_table1);

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

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

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

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

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

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

+$rows = $result->fetch_multi(2);

+is_deeply($rows, [[1, 2],

+                  [3, 4]], "fetch_multi first");

+$rows = $result->fetch_multi(2);

+is_deeply($rows, [[5, 6],

+                  [7, 8]], "fetch_multi secound");

+$rows = $result->fetch_multi(2);

+is_deeply($rows, [[9, 10]], "fetch_multi third");

+$rows = $result->fetch_multi(2);

+ok(!$rows);

+

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

+eval {$result->fetch_multi};

+like($@, qr/Row count must be specified/, "Not specified row count");

+

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

+$rows = $result->fetch_hash_multi(2);

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

+                  {key1 => 3, key2 => 4}], "fetch_multi first");

+$rows = $result->fetch_hash_multi(2);

+is_deeply($rows, [{key1 => 5, key2 => 6},

+                  {key1 => 7, key2 => 8}], "fetch_multi secound");

+$rows = $result->fetch_hash_multi(2);

+is_deeply($rows, [{key1 => 9, key2 => 10}], "fetch_multi third");

+$rows = $result->fetch_hash_multi(2);

+ok(!$rows);

+

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

+eval {$result->fetch_hash_multi};

+like($@, qr/Row count must be specified/, "Not specified row count");

+

+

+