@@ -1,3 +1,5 @@

+0.1201

+  Changed many(not backword compatible)

 0.1101

   rename DBIx::Custom::SQLite last_insert_id to last_insert_rowid

 0.1001

@@ -4,12 +4,13 @@ use strict;

 use warnings;

 use base 'Object::Simple';

+

 use Carp 'croak';

 use DBI;

 use DBIx::Custom::Result;

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

-use DBIx::Custom::Transaction;

 use DBIx::Custom::Query;

+use DBIx::Custom::KeyInfo;

 __PACKAGE__->attr('dbh');

@@ -23,9 +24,6 @@ __PACKAGE__->dual_attr([qw/user password data_source/], inherit => 'scalar_copy'

 __PACKAGE__->dual_attr([qw/database host port/],        inherit => 'scalar_copy');

 __PACKAGE__->dual_attr([qw/bind_filter fetch_filter/],  inherit => 'scalar_copy');

-__PACKAGE__->dual_attr([qw/no_bind_filters no_fetch_filters/],

-                       default => sub { [] }, inherit => 'array_copy');

-

 __PACKAGE__->dual_attr([qw/options filters formats/],

                        default => sub { {} }, inherit => 'hash_copy');

@@ -217,15 +215,9 @@ sub create_query {

     # Set bind filter

     $query->bind_filter($self->bind_filter);

-    # Set no filter keys when binding

-    $query->no_bind_filters($self->no_bind_filters);

-    

     # Set fetch filter

     $query->fetch_filter($self->fetch_filter);

-    # Set no filter keys when fetching

-    $query->no_fetch_filters($self->no_fetch_filters);

-    

     return $query;

 }

@@ -278,7 +270,6 @@ sub query{

             _dbi             => $self,

             sth              => $sth,

             fetch_filter     => $query->fetch_filter,

-            no_fetch_filters => $query->no_fetch_filters

         });

         return $result;

     }

@@ -301,9 +292,9 @@ sub _build_bind_values {

         my $pos          = $key_info->pos;

         # Value

-        my $value = $id && $pos ? $params->{$id}->{$column}->[$pos]

-                  : $id         ? $params->{$id}->{$column}

-                  : $pos        ? $params->{$column}->[$pos]

+        my $value = $id && defined $pos ? $params->{$id}->{$column}->[$pos]

+                  : $id                 ? $params->{$id}->{$column}

+                  : defined $pos        ? $params->{$column}->[$pos]

                   : $params->{$column};

         # Filter

@@ -320,18 +311,15 @@ sub transaction { DBIx::Custom::Transaction->new(dbi => shift) }

 sub run_transaction {

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

-    # DBIx::Custom object

-    my $dbi = $self->dbi;

-    

     # Shorcut

-    return unless $dbi;

+    return unless $self;

     # Check auto commit

     croak("AutoCommit must be true before transaction start")

-      unless $dbi->_auto_commit;

+      unless $self->_auto_commit;

     # Auto commit off

-    $dbi->_auto_commit(0);

+    $self->_auto_commit(0);

     # Run transaction

     eval {$transaction->()};

@@ -342,13 +330,13 @@ sub run_transaction {

     # Tranzaction is failed.

     if ($transaction_error) {

         # Rollback

-        eval{$dbi->dbh->rollback};

+        eval{$self->dbh->rollback};

         # Rollback error

         my $rollback_error = $@;

         # Auto commit on

-        $dbi->_auto_commit(1);

+        $self->_auto_commit(1);

         if ($rollback_error) {

             # Rollback is failed

@@ -362,11 +350,11 @@ sub run_transaction {

     # Tranzaction is success

     else {

         # Commit

-        eval{$dbi->dbh->commit};

+        eval{$self->dbh->commit};

         my $commit_error = $@;

         # Auto commit on

-        $dbi->_auto_commit(1);

+        $self->_auto_commit(1);

         # Commit is failed

         croak($commit_error) if $commit_error;

@@ -466,7 +454,13 @@ sub update {

     if (@where_keys) {

         $where_clause = 'where ';

         foreach my $where_key (@where_keys) {

-            $where_clause .= "{= $where_key} and ";

+            my $key_info = DBIx::Custom::KeyInfo->new($where_key);

+            

+            my $table_new = $key_info->table || $table;

+            my $column = $table_new . '.' . $key_info->column

+                         . '#@where';

+

+            $where_clause .= "{= $column} and ";

         }

         $where_clause =~ s/ and $//;

     }

@@ -486,7 +480,7 @@ sub update {

     $query_edit_cb->($query) if $query_edit_cb;

     # Rearrange parammeters

-    my $params = {%$update_params, %$where_params};

+    my $params = {%$update_params, '@where' => $where_params};

     # Execute query

     my $ret_val = $self->query($query, $params);

@@ -618,11 +612,23 @@ sub select {

     # Where clause keys

     my @where_keys = keys %$where_params;

+    my $where_params_new = {};

+    

     # Join where clause

     if (@where_keys) {

         $template .= 'where ';

         foreach my $where_key (@where_keys) {

-            $template .= "{= $where_key} and ";

+            my $key_info = DBIx::Custom::KeyInfo->new($where_key);

+            

+            my $table_new = $key_info->table || $tables->[0];

+            my $column = $table_new . '.' . $key_info->column

+                         . '#' . $table_new;

+                      

+            $template .= "{= $column} and ";

+            

+            $where_params_new->{$table_new} ||= {};

+            $where_params_new->{$table_new}->{$key_info->column}

+              = $where_params->{$where_key};

         }

     }

     $template =~ s/ and $//;

@@ -647,7 +653,7 @@ sub select {

     $query_edit_cb->($query) if $query_edit_cb;

     # Execute query

-    my $result = $self->query($query, $where_params);

+    my $result = $self->query($query, $where_params_new);

     return $result;

 }

@@ -692,11 +698,11 @@ DBIx::Custom - Customizable DBI

 =head1 VERSION

-Version 0.1101

+Version 0.1201

 =cut

-our $VERSION = '0.1101';

+our $VERSION = '0.1201';

 =head1 STATE

@@ -869,20 +875,6 @@ Bind filter arguemts is

     3. $dbi   : DBIx::Custom object

     4. $infos : {type => $table, sth => $sth, index => $index}

-=head2 no_bind_filters

-

-Key list which dose not have to bind filtering

-    

-    $dbi             = $dbi->no_bind_filters(qw/title author/);

-    $no_bind_filters = $dbi->no_bind_filters;

-

-=head2 no_fetch_filters

-

-Key list which dose not have to fetch filtering

-

-    $dbi              = $dbi->no_fetch_filters(qw/title author/);

-    $no_fetch_filters = $dbi->no_fetch_filters;

-

 =head2 result_class

 Resultset class

@@ -23,7 +23,7 @@ sub parse {

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

     # Parse

-    ($key || '') =~ /^(?:(.+?)\.)?(.+?)(?:@(.+))?$/;

+    ($key || '') =~ /^(?:(.+?)\.)?(.+?)(?:#(.+))?$/;

     $self->table($1 || '');

     $self->column($2 || '');

     $self->id($3 || '');

@@ -6,35 +6,6 @@ use warnings;

 use base 'Object::Simple';

 __PACKAGE__->attr([qw/sql key_infos bind_filter fetch_filter sth/]);

-__PACKAGE__->attr(_no_bind_filters => sub { {} });

-__PACKAGE__->attr(no_fetch_filters => sub { [] });

-

-sub new {

-    my $self = shift->SUPER::new(@_);

-    

-    # Initialize attributes

-    $self->no_bind_filters($self->{no_bind_filters})

-      if $self->{no_bind_filters};

-    

-    return $self;

-}

-

-sub no_bind_filters {

-    my $self = shift;

-    

-    if (@_) {

-        # Set

-        $self->{no_bind_filters} = $_[0];

-        

-        # Cached

-        my %no_bind_filters = map { $_ => 1 } @{$self->{no_bind_filters}};

-        $self->_no_bind_filters(\%no_bind_filters);

-        

-        return $self;

-    }

-    

-    return $self->{no_bind_filters};

-}

 1;

@@ -50,12 +21,9 @@ DBIx::Custom::Query - DBIx::Custom query

     # Create by using create_query

     my $query = DBIx::Custom->create_query($template);

-    # Set attributes

+    # Attributes

     $query->bind_filter($dbi->filters->{default_bind_filter});

-    $query->no_bind_filters('title', 'author');

-    

     $query->fetch_filter($dbi->filters->{default_fetch_filter});

-    $query->no_fetch_filters('title', 'author');

 =head1 ATTRIBUTES

@@ -80,13 +48,6 @@ Filter excuted when value is bind

     $query       = $query->bind_filter($bind_filter);

     $bind_filter = $query->bind_filter;

-=head2 no_bind_filters

-

-Key list which dose not have to bind filtering

-

-    $query           = $query->no_bind_filters($no_filters);

-    $no_bind_filters = $query->no_bind_filters;

-

 =head2 fetch_filter

 Filter excuted when data is fetched

@@ -94,13 +55,6 @@ Filter excuted when data is fetched

     $query        = $query->fetch_filter($fetch_filter);

     $fetch_filter = $query->fetch_filter;

-=head2 no_fetch_filters

-

-Key list which dose not have to fetch filtering

-

-    $query            = $query->no_fetch_filters($no_filters);

-    $no_fetch_filters = $query->no_fetch_filters;

-

 =head2 key_infos

 Key informations

@@ -8,35 +8,6 @@ use base 'Object::Simple';

 use Carp 'croak';

 __PACKAGE__->attr([qw/_dbi sth fetch_filter/]);

-__PACKAGE__->attr(_no_fetch_filters => sub { {} });

-

-sub new {

-    my $self = shift->SUPER::new(@_);

-    

-    # Initialize attributes

-    $self->no_fetch_filters($self->{no_fetch_filters})

-      if exists $self->{no_fetch_filters};

-    

-    return $self;

-}

-

-sub no_fetch_filters {

-    my $self = shift;

-    

-    if (@_) {

-        

-        # Set

-        $self->{no_fetch_filters} = $_[0];

-        

-        # Cached

-        my %no_fetch_filters = map {$_ => 1} @{$self->{no_fetch_filters}};

-        $self->_no_fetch_filters(\%no_fetch_filters);

-        

-        return $self;

-    }

-    

-    return $self->{no_fetch_filters};

-}

 sub fetch {

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

@@ -54,7 +25,6 @@ sub fetch {

         my $keys  = $sth->{NAME_lc};

         my $types = $sth->{TYPE};

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

-            next if $self->_no_fetch_filters->{$keys->[$i]};

             $row->[$i]= $fetch_filter->($row->[$i], $keys->[$i], $self->_dbi,

                                         {type => $types->[$i], sth => $sth, index => $i});

         }

@@ -81,14 +51,9 @@ sub fetch_hash {

     if ($fetch_filter) {

         my $types = $sth->{TYPE};

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

-            if ($self->_no_fetch_filters->{$keys->[$i]}) {

-                $row_hash->{$keys->[$i]} = $row->[$i];

-            }

-            else {

-                $row_hash->{$keys->[$i]}

-                  = $fetch_filter->($row->[$i], $keys->[$i], $self->_dbi,

-                                    {type => $types->[$i], sth => $sth, index => $i});

-            }

+            $row_hash->{$keys->[$i]}

+              = $fetch_filter->($row->[$i], $keys->[$i], $self->_dbi,

+                                {type => $types->[$i], sth => $sth, index => $i});

         }

     }

@@ -242,13 +207,6 @@ Filter excuted when data is fetched

     $result         = $result->fetch_filter($sth);

     $fetch_filter   = $result->fech_filter;

-=head2 no_fetch_filters

-

-Key list which dose not have to fetch filtering

-

-    $result           = $result->no_fetch_filters($no_fetch_filters);

-    $no_fetch_filters = $result->no_fetch_filters;

-

 =head1 METHODS

 This class is L<Object::Simple> subclass.

@@ -237,14 +237,18 @@ sub expand_basic_tag {

     croak("You must be pass key as argument to tag '{$tag_name }'")

       unless $key;

+    # Key info

+    my $key_info = DBIx::Custom::KeyInfo->new($key);

+    $key_info->table($table) unless $key_info->table;

+

     # Expanded tag

+    my $column = $key_info->table

+               ? $key_info->table . '.' . $key_info->column

+               : $key_info->column;

     my $expand = $tag_name eq '?'

                ? '?'

-               : "$key $tag_name ?";

-    

-    my $key_info = DBIx::Custom::KeyInfo->new($key);

-    $key_info->table($table) unless $key_info->table;

-    

+               : "$column $tag_name ?";

+

     return ($expand, [$key_info]);

 }

@@ -263,7 +267,12 @@ sub expand_in_tag {

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

     # Expand tag

-    my $expand = "$key $tag_name (";

+    my $key_info = DBIx::Custom::KeyInfo->new($key);

+    my $column = $key_info->table

+               ? $key_info->table . '.' . $key_info->column

+               : $key_info->column;

+

+    my $expand = "$column $tag_name (";

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

         $expand .= '?, ';

     }

@@ -25,7 +25,7 @@ my $CREATE_TABLE = {

     2 => 'create table table2 (key1 char(255), key3 char(255));'

 };

-my $SELECT_TMPL = {

+my $SELECT_TMPLS = {

     0 => 'select * from table1;'

 };

@@ -180,19 +180,17 @@ $insert_tmpl = "insert into table1 {insert key1 key2}";

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

     my $query = shift;

     $query->bind_filter(sub {

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

-        if ($column eq 'key2') {

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

+        if ($column eq 'key2' && $dbi->isa('DBIx::Custom')) {

             return $value + 1;

         }

         return $value;

     });

 });

-$result = $dbi->query(['table1', $SELECT_TMPL->{0}]);

+$result = $dbi->query(['table1', $SELECT_TMPLS->{0}]);

 $rows = $result->fetch_hash_all;

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

-__END__

-

 test 'Filter basic';

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

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

@@ -200,7 +198,7 @@ $dbi->do($CREATE_TABLE->{0});

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

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

 $insert_query->bind_filter(sub {

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

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

     if ($table eq '' && $column eq 'key1')

     {

@@ -209,7 +207,7 @@ $insert_query->bind_filter(sub {

     return $value;

 });

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

-$select_query = $dbi->create_query($SELECT_TMPL->{0});

+$select_query = $dbi->create_query($SELECT_TMPLS->{0});

 $select_query->fetch_filter(sub {

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

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

@@ -225,32 +223,23 @@ $result = $dbi->query($select_query);

 $rows = $result->fetch_hash_all;

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

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

-$insert_query->no_bind_filters(['key1']);

-$select_query->no_fetch_filters(['key2']);

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

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

-$rows = $result->fetch_hash_all;

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

-

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

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

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

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

 $insert_query->bind_filter(sub {

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

-    my ($table, $column) = @{$infos}{qw/table column/};

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

-    if ($key eq 'table1.key1' && $table eq 'table1' && $column eq 'key1') {

+    if ($table eq 'table1' && $column eq 'key1') {

         return $value * 3;

     }

     return $value;

 });

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

-$select_query = $dbi->create_query($SELECT_TMPL->{0});

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

+$select_query = $dbi->create_query($SELECT_TMPLS->{0});

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

 $rows = $result->fetch_hash_all;

-is_deeply($rows, [{key1 => 3, key2 => 2}], "$test : insert with table name");

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

 test 'Filter in';

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

@@ -259,15 +248,14 @@ $dbi->query($insert_query, {key1 => 2, key2 => 4});

 $select_tmpl = "select * from table1 where {in table1.key1 2} and {in table1.key2 2}";

 $select_query = $dbi->create_query($select_tmpl);

 $select_query->bind_filter(sub {

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

-    my ($table, $column) = @{$infos}{qw/table column/};

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

-    if ($key eq 'table1.key1' && $table eq 'table1' && $column eq 'key1' || $key eq 'table1.key2') {

+    if ($table eq 'table1' && $column eq 'key1') {

         return $value * 2;

     }

     return $value;

 });

-$result = $dbi->query($select_query, {table1 => {key1 => [1,5], key2 => [2,5]}});

+$result = $dbi->query($select_query, {key1 => [1,5], key2 => [2,4]});

 $rows = $result->fetch_hash_all;

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

@@ -285,15 +273,15 @@ $result = $dbi->query($query, {key1 => 1, key2 => 3, key3 => 4, key4 => 3, key5

 $rows = $result->fetch_hash_all;

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

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

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

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

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

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

 $rows = $result->fetch_hash_all;

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

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

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

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

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

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

 $rows = $result->fetch_hash_all;

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

@@ -303,15 +291,15 @@ $result = $dbi->query($query, {key1 => 1, key2 => '%2%'});

 $rows = $result->fetch_hash_all;

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

-$tmpl = "select * from table1 where {<= table1.key1} and {like table1.key2};";

+$tmpl = "select * from table1 where {<= table1.key1#id} and {like table1.key2#id};";

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

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

+$result = $dbi->query($query, {id => {key1 => 1, key2 => '%2%'}});

 $rows = $result->fetch_hash_all;

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

 $tmpl = "select * from table1 where {<= table1.key1} and {like table1.key2};";

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

-$result = $dbi->query($query, {'table1.key1' => 1, 'table1.key2' => '%2%'});

+$result = $dbi->query($query, {'key1' => 1, 'key2' => '%2%'});

 $rows = $result->fetch_hash_all;

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

@@ -329,15 +317,15 @@ $result = $dbi->query($query, {key1 => [9, 1]});

 $rows = $result->fetch_hash_all;

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

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

+$tmpl = "select * from table1 where {in table1.key1#id 2};";

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

-$result = $dbi->query($query, {table1 => {key1 => [9, 1]}});

+$result = $dbi->query($query, {id => {key1 => [9, 1]}});

 $rows = $result->fetch_hash_all;

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

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

+$tmpl = "select * from table1 where {in table1.key1#id 2};";

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

-$result = $dbi->query($query, {'table1.key1' => [9, 1]});

+$result = $dbi->query($query, {id => {'key1' => [9, 1]}});

 $rows = $result->fetch_hash_all;

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

@@ -347,25 +335,17 @@ $dbi->do("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});

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

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

 $rows = $result->fetch_hash_all;

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

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

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

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

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

+$insert_tmpl = 'insert into table1 {insert table1.key1#id table1.key2#id table1.key3#id table1.key4#id table1.key5#id}';

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

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

 $rows = $result->fetch_hash_all;

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

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

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

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

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

-$rows = $result->fetch_hash_all;

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

-

-

 test 'DBIx::Custom::SQL::Template update tag';

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

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

@@ -375,25 +355,18 @@ $dbi->query($insert_tmpl, {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 1

 $update_tmpl = 'update table1 {update key1 key2 key3 key4} where {= key5}';

 $dbi->query($update_tmpl, {key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5});

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

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

 $rows = $result->fetch_hash_all;

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

-$update_tmpl = 'update table1 {update table1.key1 table1.key2 table1.key3 table1.key4} where {= table1.key5}';

-$dbi->query($update_tmpl, {table1 => {key1 => 3, key2 => 3, key3 => 3, key4 => 3, key5 => 5}});

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

+$update_tmpl = 'update table1 {update table1.key1#id table1.key2#id table1.key3#id table1.key4#id} where {= table1.key5#id}';

+$dbi->query($update_tmpl, {id => {key1 => 3, key2 => 3, key3 => 3, key4 => 3, key5 => 5}});

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

 $rows = $result->fetch_hash_all;

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

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

-$update_tmpl = 'update table1 {update table1.key1 table1.key2 table1.key3 table1.key4} where {= table1.key5}';

-$dbi->query($update_tmpl, {'table1.key1' => 4, 'table1.key2' => 4, 'table1.key3' => 4, 'table1.key4' => 4, 'table1.key5' => 5});

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

-$rows = $result->fetch_hash_all;

-is_deeply($rows, [{key1 => 4, key2 => 4, key3 => 4, key4 => 4, key5 => 5},

-                  {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10}], "$test : with table name dot");

-

 test 'transaction';

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

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

@@ -402,7 +375,7 @@ $dbi->run_transaction(sub {

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

     $dbi->query($insert_tmpl, {key1 => 3, key2 => 4});

 });

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

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

 $rows   = $result->fetch_hash_all;

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

@@ -419,7 +392,7 @@ eval{

 };

 like($@, qr/Fatal Error.*Rollback is success/ms, "$test : Rollback success message");

 ok(!$dbi->dbh->{RaiseError}, "$test : restore RaiseError value");

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

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

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [], "$test : rollback");

@@ -455,20 +428,12 @@ $dbi = DBIx::Custom->new($NEW_ARGS->{0});

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

 ok($@, "$test : create_query invalid SQL template");

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

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

-$query = $dbi->create_query("select * from table1 where {= key1}");

-eval{$dbi->query($query, {key2 => 1})};

-like($@, qr/Corresponding key is not found in your parameters/, 

-        "$test : execute corresponding key not found");

-

-

 test 'insert';

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

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

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

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

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

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

 $rows   = $result->fetch_hash_all;

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

@@ -476,14 +441,14 @@ $dbi->do('delete from table1');

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

     my $query = shift;

     $query->bind_filter(sub {

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

-        if ($key eq 'key1') {

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

+        if ($column eq 'key1') {

             return $value * 3;

         }

         return $value;

     });

 });

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

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

 $rows   = $result->fetch_hash_all;

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

@@ -507,21 +472,21 @@ $dbi->do($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}, {key1 => 1});

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

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

 $rows   = $result->fetch_hash_all;

 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->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}, {key2 => 2, key3 => 3});

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

-#$rows   = $result->fetch_hash_all;

-#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->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}, {key2 => 2, key3 => 3});

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

+$rows   = $result->fetch_hash_all;

+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->insert('table1', {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

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

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

     my $query = shift;

     $query->bind_filter(sub {

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

-        if ($key eq 'key2') {

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

+        if ($column eq 'key2') {

             return $value * 2;

         }

         return $value;

     });

 });

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

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

 $rows   = $result->fetch_hash_all;

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

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

@@ -544,7 +509,7 @@ is_deeply($rows, [{key1 => 1, key2 => 22, key3 => 3, key4 => 4, key5 => 5},

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

     my $query = shift;

-    is($query->sql, 'update table1 set key2 = ? where key1 = ?    ;',

+    is($query->sql, 'update table1 set key2 = ? where table1.key1 = ?    ;',

        "$test: append statement");

 });

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

 $dbi->update_all('table1', {key2 => 10}, sub {

     my $query = shift;

     $query->bind_filter(sub {

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

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

         return $value * 2;

     })

 });

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

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

 $rows   = $result->fetch_hash_all;

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

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

@@ -590,7 +555,7 @@ $dbi->do($CREATE_TABLE->{0});

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

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

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

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

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

 $rows   = $result->fetch_hash_all;

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

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

 $dbi->delete('table1', {key2 => 1}, sub {

     my $query = shift;

     $query->bind_filter(sub {

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

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

         return $value * 2;

     });

 });

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

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

 $rows   = $result->fetch_hash_all;

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

 $dbi->delete('table1', {key1 => 1}, '   ', sub {

     my $query = shift;

-    is($query->sql, 'delete from table1 where key1 = ?    ;',

+    is($query->sql, 'delete from table1 where table1.key1 = ?    ;',

        "$test: append statement");

 });

@@ -641,7 +606,7 @@ $dbi->do($CREATE_TABLE->{0});

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

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

 $dbi->delete_all('table1');

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

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

 $rows   = $result->fetch_hash_all;

 is_deeply($rows, [], "$test : basic");

@@ -670,8 +635,8 @@ is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : append statement");

 $rows = $dbi->select('table1', {key1 => 2}, sub {

     my $query = shift;

     $query->bind_filter(sub {

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

-        if ($key eq 'key1') {

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

+        if ($column eq 'key1') {

             return $value - 1;

         }

         return $value;

@@ -215,9 +215,3 @@ test 'Accessor';

 $dbi = DBIx::Custom->new;

 $dbi->options({opt1 => 1, opt2 => 2});

 is_deeply(scalar $dbi->options, {opt1 => 1, opt2 => 2}, "$test : options");

-

-$dbi->no_bind_filters(['a', 'b']);

-is_deeply(scalar $dbi->no_bind_filters, ['a', 'b'], "$test: no_bind_filters");

-

-$dbi->no_fetch_filters(['a', 'b']);

-is_deeply(scalar $dbi->no_fetch_filters, ['a', 'b'], "$test: no_fetch_filters");

@@ -18,20 +18,12 @@ $query = DBIx::Custom::Query->new(

     sql              => 'a',

     key_infos        => 'b',

     bind_filter      => 'c',

-    no_bind_filters  => [qw/d e/],

     sth              => 'e',

     fetch_filter     => 'f',

-    no_fetch_filters => [qw/g h/],

 );

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

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

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

-is_deeply($query->no_bind_filters, [qw/d e/], "$test : no_bind_filters");

-is_deeply($query->_no_bind_filters, {d => 1, e => 1}, "$test : _no_bind_filters");

-is_deeply($query->no_fetch_filters, [qw/g h/], "$test : no_fetch_filters");

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

-$query->no_bind_filters(undef);

-is_deeply(scalar $query->_no_bind_filters, {}, "$test _no_bind_filters undef value");

-

@@ -227,17 +227,6 @@ $result->fetch_filter($fetch_filter);

 $rows = $result->fetch_hash_all;

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

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

-$result->no_fetch_filters(['key1']);

-$rows = $result->fetch_all;

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

-

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

-$result->no_fetch_filters(['key1']);

-$rows = $result->fetch_hash_all;

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

-

-

 test 'finish';

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

 $result->fetch;