@@ -10,14 +10,16 @@ use DBIx::Custom;

     no warnings 'redefine';

     has dsn => 'dbi:SQLite:dbname=:memory:';

     sub quote { '""' }

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

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

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

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

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

-    sub create_table_reserved { 'create table "table" ("select", "update")' }

+    

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

+    

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

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

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

+    sub create_table_reserved { 'create table "table" ("select" varchar, "update" varchar)' }

 }

 require "$FindBin::Bin/common.t";

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

     package DBIx::Custom;

     no warnings 'redefine';

     has dsn => 'dbi:SQLite:dbname=:memory:';

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

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

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

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

     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_table1_highperformance { "create table table1 (ab varchar, bc varchar, ik varchar, hi varchar, ui varchar, pq varchar, dc varchar);" }

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

-    sub create_table_reserved { 'create table "table" ("select", "update")' }

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

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

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

+    sub create_table_reserved { 'create table "table" ("select" varchar, "update" varchar)' }

 }

 require "$FindBin::Bin/common.t";

@@ -2993,4 +2993,17 @@ $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}]);

+

 1;

@@ -151,12 +151,12 @@ use MyDBI1;

 }

 # Constant

-my $create_table1 = 'create table table1 (key1 char(255), key2 char(255));';

-my $create_table1_2 = 'create table table1 (key1 char(255), key2 char(255), key3 char(255), key4 char(255), key5 char(255));';

-my $create_table2 = 'create table table2 (key1 char(255), key3 char(255));';

-my $create_table2_2 = "create table table2 (key1, key2, key3)";

-my $create_table3 = "create table table3 (key1, key2, key3)";

-my $create_table_reserved = 'create table "table" ("select", "update")';

+my $create_table1 = 'create table table1 (key1 varchar, key2 varchar);';

+my $create_table1_2 = 'create table table1 (key1 varchar, key2 varchar, key3 varchar, key4 varchar, key5 varchar);';

+my $create_table2 = 'create table table2 (key1 varchar, key3 varchar);';

+my $create_table2_2 = "create table table2 (key1 varchar, key2 varchar, key3 varchar)";

+my $create_table3 = "create table table3 (key1 varchar, key2 varchar, key3 varchar)";

+my $create_table_reserved = 'create table "table" ("select" varchar, "update" varchar)';

 my $q = '"';

 my $p = '"';

@@ -196,40 +196,6 @@ my $binary;

 # Prepare table

 $dbi = DBIx::Custom->connect;

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

 ### a little complex test

 test 'table_alias';

 $dbi = DBIx::Custom->connect;

@@ -1187,24 +1153,6 @@ $result = $dbi->select(table => 'table1');

 eval {$result->fetch_hash_multi};

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

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

 # DEPRECATED! test

 test 'filter __ expression';

 $dbi = DBIx::Custom->connect;