@@ -128,44 +128,6 @@ sub reconnect {

     return $self;

 }

-sub prepare {

-    my ($self, $sql) = @_;

-    

-    # Connect if not

-    $self->connect unless $self->connected;

-    

-    # Prepare

-    my $sth = eval{$self->dbh->prepare($sql)};

-    

-    # Error

-    croak("$@<Your SQL>\n$sql") if $@;

-    

-    return $sth;

-}

-

-sub do{

-    my ($self, $sql, @bind_values) = @_;

-    

-    # Connect if not

-    $self->connect unless $self->connected;

-    

-    # Do

-    my $affected = eval{$self->dbh->do($sql, @bind_values)};

-    

-    # Error

-    if ($@) {

-        my $error = $@;

-        require Data::Dumper;

-        

-        my $bind_value_dump

-          = Data::Dumper->Dump([\@bind_values], ['*bind_valuds']);

-        

-        croak("$error<Your SQL>\n$sql\n<Your bind values>\n$bind_value_dump\n");

-    }

-    

-    return $affected;

-}

-

 sub create_query {

     my ($self, $template) = @_;

@@ -200,7 +162,7 @@ sub create_query {

     $self->connect unless $self->connected;

     # Prepare statement handle

-    my $sth = $self->prepare($query->{sql});

+    my $sth = $self->dbh->prepare($query->{sql});

     # Set statement handle

     $query->sth($sth);

@@ -363,8 +325,11 @@ sub create_table {

     # End

     $sql .= ");";

+    # Connect

+    $self->connect unless $self->connected;

+    

     # Do query

-    return $self->do($sql);

+    return $self->dbh->do($sql);

 }

 sub drop_table {

@@ -373,8 +338,11 @@ sub drop_table {

     # Drop table

     my $sql = "drop table $table;";

+    # Connect

+    $self->connect unless $self->connected;

+

     # Do query

-    return $self->do($sql);

+    return $self->dbh->do($sql);

 }

 our %VALID_INSERT_ARGS = map { $_ => 1 } qw/append filter/;

@@ -1122,33 +1090,8 @@ You can also edit query

         }

     }

-=head2 prepare

-

-Prepare statement handle.

-

-    $sth = $dbi->prepare('select * from books;');

-

-This method is same as DBI prepare method.

-

-See also L<DBI>.

-

-=head2 do

-

-Execute SQL

-

-    $affected = $dbi->do('insert into books (title, author) values (?, ?)',

-                        'Perl', 'taro');

-

-Retrun value is affected rows count.

-

-This method is same as DBI do method.

-

-See also L<DBI>

-

 =head2 run_transaction

-

-

 =head1 DBIx::Custom default configuration

 DBIx::Custom have DBI object.

@@ -18,7 +18,7 @@ __PACKAGE__->dual_attr('tag_end',   default => '}', inherit => 'scalar_copy');

 __PACKAGE__->dual_attr('tag_syntax', inherit => 'scalar_copy');

 __PACKAGE__->resist_tag_processor(

-    '?'      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

+    '?'      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_placeholder_tag,

     '='      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

     '<>'     => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

     '>'      => \&DBIx::Custom::SQLTemplate::TagProcessors::expand_basic_tag,

@@ -38,13 +38,13 @@ sub expand_in_tag {

     my ($column, $count) = @$tag_args;

     # Key must be specified

-    croak("You must be pass key as first argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$count}")

+    croak("You must be pass key as first argument of tag '{in }'\n" . 

+          "Usage: {in \$key \$count}")

       unless $column;

     # Place holder count must be specified

-    croak("You must be pass placeholder count as second argument of tag '{$tag_name }'\n" . 

-          "Usage: {$tag_name \$key \$count}")

+    croak("You must be pass value count as second argument of tag '{in }'\n" . 

+          "Usage: {in \$key \$count}")

       if !$count || $count =~ /\D/;

     # Expand tag

@@ -8,7 +8,7 @@ BEGIN {

 	use_ok( 'DBIx::Custom::MySQL' );

 	use_ok( 'DBIx::Custom::Query' );

 	use_ok( 'DBIx::Custom::Result' );

-	use_ok( 'DBIx::Custom::SQL::Template' );

+	use_ok( 'DBIx::Custom::SQLTemplate' );

 	use_ok( 'DBIx::Custom::SQLite' );

 }

@@ -72,22 +72,6 @@ $dbi->connect;

 ok($dbi->connected, "$test : connected");

-test 'preapare';

-$dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$sth = $dbi->prepare($CREATE_TABLE->{0});

-ok($sth, "$test : auto connect");

-$sth->execute;

-$sth = $dbi->prepare($DROP_TABLE->{0});

-ok($sth, "$test : basic");

-

-

-test 'do';

-$dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$ret_val = $dbi->do($CREATE_TABLE->{0});

-ok(defined $ret_val, "$test : auto connect");

-$ret_val = $dbi->do($DROP_TABLE->{0});

-ok(defined $ret_val, "$test : basic");

-

 test 'create_table';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 $ret_val = $dbi->create_table(

@@ -109,11 +93,9 @@ ok($@, "$test : table not exist");

 # Prepare table

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 $dbi->connect;

-$dbi->do($CREATE_TABLE->{0});

-$sth = $dbi->prepare("insert into table1 (key1, key2) values (?, ?);");

-$sth->execute(1, 2);

-$sth->execute(3, 4);

-

+$dbi->query($CREATE_TABLE->{0});

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

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

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

 $tmpl = "select key1, key2 from table1";

@@ -165,8 +147,8 @@ is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch_hash_all list context");

 test 'Insert query return value';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $tmpl = "insert into table1 {insert key1 key2}";

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

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

@@ -174,8 +156,8 @@ ok($ret_val, $test);

 test 'Direct query';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $insert_tmpl = "insert into table1 {insert key1 key2}";

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

 $result = $dbi->query($SELECT_TMPLS->{0});

@@ -183,8 +165,8 @@ $rows = $result->fetch_hash_all;

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

 test 'Filter basic';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $dbi->resist_filter(twice       => sub { $_[0] * 2}, 

                     three_times => sub { $_[0] * 3});

@@ -195,10 +177,10 @@ $dbi->query($insert_query, {key1 => 1, key2 => 2});

 $result = $dbi->query($SELECT_TMPLS->{0});

 $rows = $result->filter({key2 => 'three_times'})->fetch_hash_all;

 is_deeply($rows, [{key1 => 2, key2 => 6}], "$test : filter fetch_filter");

-$dbi->do($DROP_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

 test 'Filter in';

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $insert_tmpl  = "insert into table1 {insert key1 key2};";

 $insert_query = $dbi->create_query($insert_tmpl);

 $dbi->query($insert_query, {key1 => 2, key2 => 4});

@@ -210,11 +192,10 @@ $rows = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 2, key2 => 4}], "$test : filter");

 test 'DBIx::Custom::SQLTemplate basic tag';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{1});

-$sth = $dbi->prepare("insert into table1 (key1, key2, key3, key4, key5) values (?, ?, ?, ?, ?);");

-$sth->execute(1, 2, 3, 4, 5);

-$sth->execute(6, 7, 8, 9, 10);

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{1});

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

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

 $tmpl = "select * from table1 where {= key1} and {<> key2} and {< key3} and {> key4} and {>= key5};";

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

@@ -229,11 +210,10 @@ $rows = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$test : basic tag2");

 test 'DIB::Custom::SQLTemplate in tag';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{1});

-$sth = $dbi->prepare("insert into table1 (key1, key2, key3, key4, key5) values (?, ?, ?, ?, ?);");

-$sth->execute(1, 2, 3, 4, 5);

-$sth->execute(6, 7, 8, 9, 10);

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{1});

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

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

 $tmpl = "select * from table1 where {in key1 2};";

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

@@ -242,7 +222,7 @@ $rows = $result->fetch_hash_all;

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

 test 'DBIx::Custom::SQLTemplate insert tag';

-$dbi->do("delete from table1");

+$dbi->query("delete from table1");

 $insert_tmpl = 'insert into table1 {insert key1 key2 key3 key4 key5}';

 $dbi->query($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

@@ -251,7 +231,7 @@ $rows = $result->fetch_hash_all;

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

 test 'DBIx::Custom::SQLTemplate update tag';

-$dbi->do("delete from table1");

+$dbi->query("delete from table1");

 $insert_tmpl = "insert into table1 {insert key1 key2 key3 key4 key5}";

 $dbi->query($insert_tmpl, {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

 $dbi->query($insert_tmpl, {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

@@ -265,8 +245,8 @@ is_deeply($rows, [{key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5},

                   {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : basic");

 test 'transaction';

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $dbi->run_transaction(sub {

     $insert_tmpl = 'insert into table1 {insert key1 key2}';

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

@@ -276,8 +256,8 @@ $result = $dbi->query($SELECT_TMPLS->{0});

 $rows   = $result->fetch_hash_all;

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

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 $dbi->dbh->{RaiseError} = 0;

 eval{

     $dbi->run_transaction(sub {

@@ -313,13 +293,8 @@ like($@, qr/AutoCommit must be true before transaction start/,

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 $sql = 'laksjdf';

-eval{$dbi->prepare($sql)};

-like($@, qr/$sql/, "$test : prepare fail");

-

-$dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$sql = 'laksjdf';

-eval{$dbi->do($sql, qw/1 2 3/)};

-like($@, qr/$sql/, "$test : do fail");

+eval{$dbi->query($sql, qw/1 2 3/)};

+like($@, qr/$sql/, "$test : query fail");

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 eval{$dbi->create_query("{p }")};

@@ -327,22 +302,22 @@ ok($@, "$test : create_query invalid SQL template");

 test 'insert';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

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

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

 $result = $dbi->query($SELECT_TMPLS->{0});

 $rows   = $result->fetch_hash_all;

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

-$dbi->do('delete from table1');

+$dbi->query('delete from table1');

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

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

 $result = $dbi->query($SELECT_TMPLS->{0});

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 3, key2 => 2}], "$test : filter");

-$dbi->do($DROP_TABLE->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($DROP_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

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

 $rows = $dbi->select('table1')->fetch_hash_all;

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

@@ -354,7 +329,7 @@ like($@, qr/Key-value pairs for insert must be specified to 'insert' second argu

 test 'update';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{1});

+$dbi->query($CREATE_TABLE->{1});

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

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

 $dbi->update('table1', {key2 => 11}, {where => {key1 => 1}});

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

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

                   "$test : basic");

-$dbi->do("delete from table1");

+$dbi->query("delete from table1");

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

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

 $dbi->update('table1', {key2 => 12}, {where => {key2 => 2, key3 => 3}});

@@ -374,7 +349,7 @@ is_deeply($rows, [{key1 => 1, key2 => 12, key3 => 3, key4 => 4, key5 => 5},

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

                   "$test : update key same as search key");

-$dbi->do("delete from table1");

+$dbi->query("delete from table1");

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

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

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

@@ -391,7 +366,7 @@ $result = $dbi->update('table1', {key2 => 11}, {where => {key1 => 1}, append =>

 test 'update error';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{1});

+$dbi->query($CREATE_TABLE->{1});

 eval{$dbi->update('table1')};

 like($@, qr/Key-value pairs for update must be specified to 'update' second argument/,

          "$test : update key-value pairs not specified");

@@ -402,7 +377,7 @@ like($@, qr/Key-value pairs for where clause must be specified to 'update' third

 test 'update_all';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{1});

+$dbi->query($CREATE_TABLE->{1});

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

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

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

@@ -416,7 +391,7 @@ is_deeply($rows, [{key1 => 1, key2 => 20, key3 => 3, key4 => 4, key5 => 5},

 test 'delete';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

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

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

 $dbi->delete('table1', {where => {key1 => 1}});

@@ -424,7 +399,7 @@ $result = $dbi->query($SELECT_TMPLS->{0});

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : basic");

-$dbi->do("delete from table1;");

+$dbi->query("delete from table1;");

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

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

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

@@ -445,14 +420,14 @@ is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : delete multi key");

 test 'delete error';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 eval{$dbi->delete('table1')};

 like($@, qr/Key-value pairs for where clause must be specified to 'delete' second argument/,

          "$test : where key-value pairs not specified");

 test 'delete_all';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

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

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

 $dbi->delete_all('table1');

@@ -463,7 +438,7 @@ is_deeply($rows, [], "$test : basic");

 test 'select';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

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

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

 $rows = $dbi->select('table1')->fetch_hash_all;

@@ -487,7 +462,7 @@ $rows = $dbi->select('table1', {where => {key1 => 2}, filter => {key1 => 'decrem

             ->fetch_hash_all;

 is_deeply($rows, [{key1 => 1, key2 => 2}], "$test : filter");

-$dbi->do($CREATE_TABLE->{2});

+$dbi->query($CREATE_TABLE->{2});

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

 $rows = $dbi->select([qw/table1 table2/],

                       {

@@ -501,7 +476,7 @@ is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}], "

 test 'Cache';

 $dbi = DBIx::Custom->new($NEW_ARGS->{0});

 DBIx::Custom->query_cache_max(2);

-$dbi->do($CREATE_TABLE->{0});

+$dbi->query($CREATE_TABLE->{0});

 delete $DBIx::Custom::CLASS_ATTRS->{_query_caches};

 delete $DBIx::Custom::CLASS_ATTRS->{_query_cache_keys};

 $tmpls[0] = "insert into table1 {insert key1 key2}";

@@ -3,7 +3,7 @@ use strict;

 use warnings;

 use DBIx::Custom;

-use DBIx::Custom::SQL::Template;

+use DBIx::Custom::SQLTemplate;

 # Function for test name

 my $test;

@@ -13,9 +13,9 @@ sub test {

 # Variables for test

 our $SQL_TMPL = {

-    0 => DBIx::Custom::SQL::Template->new->tag_start(0),

-    1 => DBIx::Custom::SQL::Template->new->tag_start(1),

-    2 => DBIx::Custom::SQL::Template->new->tag_start(2)

+    0 => DBIx::Custom::SQLTemplate->new->tag_start(0),

+    1 => DBIx::Custom::SQLTemplate->new->tag_start(1),

+    2 => DBIx::Custom::SQLTemplate->new->tag_start(2)

 };

 my $dbi;

@@ -111,14 +111,14 @@ is_deeply($dbi->formats, {f => 3}, "$test : formats");

 isa_ok($dbi, 'DBIx::Custom');

-test 'add_filters';

+test 'resist_filters';

 $dbi = DBIx::Custom->new;

-$dbi->add_filter(a => sub {1});

+$dbi->resist_filter(a => sub {1});

 is($dbi->filters->{a}->(), 1, $test);

-test 'add_formats';

+test 'resist_formats';

 $dbi = DBIx::Custom->new;

-$dbi->add_format(a => sub {1});

+$dbi->resist_format(a => sub {1});

 is($dbi->formats->{a}->(), 1, $test);

 test 'Accessor';

@@ -16,14 +16,14 @@ my $query;

 test 'Accessors';

 $query = DBIx::Custom::Query->new(

     sql              => 'a',

-    key_infos        => 'b',

-    query_filter      => 'c',

+    columns        => 'b',

+    filter      => 'c',

     sth              => 'e',

     fetch_filter     => 'f',

 );

 is($query->sql, 'a', "$test : sql");

-is($query->key_infos, 'b', "$test : key_infos ");

-is($query->query_filter, 'c', "$test : query_filter");

+is($query->columns, 'b', "$test : columns ");

+is($query->filter, 'c', "$test : filter");

 is($query->sth, 'e', "$test : sth");

@@ -33,7 +33,7 @@ my $row;

 my @rows;

 my $rows;

 my $result;

-my $fetch_filter;

+my $filter;

 my @error;

 my $error;

@@ -207,25 +207,18 @@ is_deeply(\@rows, [[1, 2], [3, 4]], $test);

 test 'fetch filter';

-$fetch_filter = sub {

-    my ($value, $key, $dbi, $infos) = @_;

-    my ($type, $sth, $i) = @{$infos}{qw/type sth index/};

-    

-    if ($key eq 'key1' && $value == 1 && $type =~ /char/i && $i == 0 && $sth->{TYPE}->[$i] eq $type) {

-        return $value * 3;

-    }

-    return $value;

-};

-

-$result = query($dbh, $sql);

-$result->fetch_filter($fetch_filter);

+$result = query($dbh, $sql);

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

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

+

 $rows = $result->fetch_all;

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

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

 $result = query($dbh, $sql);

-$result->fetch_filter($fetch_filter);

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

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

 $rows = $result->fetch_hash_all;

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

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

 test 'finish';

 $result = query($dbh, $sql);

@@ -3,7 +3,7 @@ use warnings;

 use Test::More 'no_plan';

-use DBIx::Custom::SQL::Template;

+use DBIx::Custom::SQLTemplate;

 # Function for test name

 my $test;

@@ -24,26 +24,13 @@ $datas = [

     {   name            => 'placeholder basic',

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

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

-        key_infos_expected   => [

-            {table => '', column => 'k1', id => ''},

-            {table => '', column => 'k2', id => ''},

-            {table => '', column => 'k3', id => ''},

-            {table => '', column => 'k4', id => ''},

-            {table => '', column => 'k5', id => ''},

-            {table => '', column => 'k6', id => ''},

-            {table => '', column => 'k7', id => ''},

-            {table => '', column => 'k8', id => ''},

-        ],

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

     },

     {

         name            => 'placeholder in',

         tmpl            => "{in k1 3};",

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

-        key_infos_expected   => [

-            {table => '', column => 'k1', id => '', pos => 0},

-            {table => '', column => 'k1', id => '', pos => 1},

-            {table => '', column => 'k1', id => '', pos => 2},

-        ],

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

     },

     # Table name

@@ -51,87 +38,79 @@ $datas = [

         name            => 'placeholder with table name',

         tmpl            => "{= a.k1} {= a.k2}",

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

-        key_infos_expected  => [

-            {table => 'a', column => 'k1', id => ''},

-            {table => 'a', column => 'k2', id => ''},

-        ],

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

     },

     {   

         name            => 'placeholder in with table name',

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

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

-        key_infos_expected  => [

-            {table => 'a', column => 'k1', id => '', pos => 0},

-            {table => 'a', column => 'k1', id => '', pos => 1},

-            {table => 'b', column => 'k2', id => '', pos => 0},

-            {table => 'b', column => 'k2', id => '', pos => 1},

-        ],

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

     },

     {

         name            => 'not contain tag',

         tmpl            => "aaa",

         sql_expected    => "aaa;",

-        key_infos_expected  => [],

+        columns_expected  => [],

     }

 ];

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

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

-    my $sql_tmpl = DBIx::Custom::SQL::Template->new;

+    my $sql_tmpl = DBIx::Custom::SQLTemplate->new;

     my $query = $sql_tmpl->create_query($data->{tmpl});

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

-    is_deeply($query->{key_infos}, $data->{key_infos_expected}, "$test : $data->{name} : key_infos");

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

 }

 test 'Original tag processor';

-$sql_tmpl = DBIx::Custom::SQL::Template->new;

+$sql_tmpl = DBIx::Custom::SQLTemplate->new;

-$ret_val = $sql_tmpl->add_tag_processor(

+$ret_val = $sql_tmpl->resist_tag_processor(

     p => sub {

         my ($tag_name, $args) = @_;

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

-        my $key_infos = [2];

-        return ($expand, $key_infos);

+        my $columns = [2];

+        return ($expand, $columns);

     }

 );

 $query = $sql_tmpl->create_query("{p a b}");

-is($query->{sql}, "p ? a b;", "$test : add_tag_processor sql");

-is_deeply($query->{key_infos}, [2], "$test : add_tag_processor key_infos");

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

+is($query->{sql}, "p ? a b;", "$test : resist_tag_processor sql");

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

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

 test "Tag processor error case";

-$sql_tmpl = DBIx::Custom::SQL::Template->new;

+$sql_tmpl = DBIx::Custom::SQLTemplate->new;

 eval{$sql_tmpl->create_query("{a }")};

 like($@, qr/Tag '{a }' in SQL template is not exist/, "$test : tag_processor not exist");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

     q => 'string'

 });

 eval{$sql_tmpl->create_query("{q}", {})};

 like($@, qr/Tag processor 'q' must be code reference/, "$test : tag_processor not code ref");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

    r => sub {} 

 });

 eval{$sql_tmpl->create_query("{r}")};

-like($@, qr/\QTag processor 'r' must return (\E\$expand\Q, \E\$key_infos\Q)/, "$test : tag processor return noting");

+like($@, qr/\QTag processor 'r' must return (\E\$expand\Q, \E\$columns\Q)/, "$test : tag processor return noting");

-$sql_tmpl->add_tag_processor({

+$sql_tmpl->resist_tag_processor({

    s => sub { return ("a", "")} 

 });

 eval{$sql_tmpl->create_query("{s}")};

-like($@, qr/\QTag processor 's' must return (\E\$expand\Q, \E\$key_infos\Q)/, "$test : tag processor return not array key_infos");

+like($@, qr/\QTag processor 's' must return (\E\$expand\Q, \E\$columns\Q)/, "$test : tag processor return not array columns");

-$sql_tmpl->add_tag_processor(

+$sql_tmpl->resist_tag_processor(

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

 );

@@ -140,8 +119,8 @@ like($@, qr/Tag '{t }' arguments cannot contain '?'/, "$test : cannot contain '?

 test 'General error case';

-$sql_tmpl = DBIx::Custom::SQL::Template->new;

-$sql_tmpl->add_tag_processor(

+$sql_tmpl = DBIx::Custom::SQLTemplate->new;

+$sql_tmpl->resist_tag_processor(

     a => sub {

         return ("? ? ?", [[],[]]);

     }

@@ -158,16 +137,16 @@ eval{$sql_tmpl->create_query("{in }")};

 like($@, qr/You must be pass key as first argument of tag '{in }'/, "$test : in : key not exist");

 eval{$sql_tmpl->create_query("{in a}")};

-like($@, qr/\QYou must be pass placeholder count as second argument of tag '{in }'\E\n\QUsage: {in \E\$key\Q \E\$placeholder_count\Q}/,

+like($@, qr/\QYou must be pass value count as second argument of tag '{in }'\E\n\QUsage: {in \E\$key\Q \E\$count\Q}/,

      "$test : in : key not exist");

 eval{$sql_tmpl->create_query("{in a r}")};

-like($@, qr/\QYou must be pass placeholder count as second argument of tag '{in }'\E\n\QUsage: {in \E\$key\Q \E\$placeholder_count\Q}/,

+like($@, qr/\QYou must be pass value count as second argument of tag '{in }'\E\n\QUsage: {in \E\$key\Q \E\$count\Q}/,

      "$test : in : key not exist");

 test 'Clone';

-$sql_tmpl = DBIx::Custom::SQL::Template->new;

+$sql_tmpl = DBIx::Custom::SQLTemplate->new;

 $sql_tmpl

   ->tag_start('[')

   ->tag_end(']')

@@ -37,7 +37,7 @@ my $id;

 test 'connect_memory';

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

 $dbi->connect_memory;

-$ret_val = $dbi->do($CREATE_TABLE->{0});

+$ret_val = $dbi->query($CREATE_TABLE->{0});

 ok(defined $ret_val, $test);

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

 $rows = $dbi->select('table1', {where => {key1 => 'a'}})->fetch_hash_all;

@@ -50,10 +50,10 @@ like($@, qr/Already connected/, "$test : already connected");

 test 'reconnect_memory';

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

 $dbi->reconnect_memory;

-$ret_val = $dbi->do($CREATE_TABLE->{0});

+$ret_val = $dbi->query($CREATE_TABLE->{0});

 ok(defined $ret_val, "$test : connect first");

 $dbi->reconnect_memory;

-$ret_val = $dbi->do($CREATE_TABLE->{2});

+$ret_val = $dbi->query($CREATE_TABLE->{2});

 ok(defined $ret_val, "$test : connect first");

 test 'connect';

@@ -62,7 +62,7 @@ unlink $db_file if -f $db_file;

 $dbi = DBIx::Custom::SQLite->new(database => $db_file);

 $dbi->connect;

 ok(-f $db_file, "$test : database file");

-$ret_val = $dbi->do($CREATE_TABLE->{0});

+$ret_val = $dbi->query($CREATE_TABLE->{0});

 ok(defined $ret_val, "$test : database");

 $dbi->disconnect;

 unlink $db_file if -f $db_file;

@@ -70,7 +70,7 @@ unlink $db_file if -f $db_file;

 test 'last_insert_rowid';

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

 $dbi->connect_memory;

-$ret_val = $dbi->do($CREATE_TABLE->{0});

+$ret_val = $dbi->query($CREATE_TABLE->{0});

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

 is($dbi->last_insert_rowid, 1, "$test: first");

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