@@ -14,9 +14,8 @@ sub user        : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub password    : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub data_source : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub database    : ClassObjectAttr { initialize => {clone => 'scalar'} }

-

 sub dbi_options : ClassObjectAttr { initialize => {clone => 'hash', 

-                                                  default => sub { {} } } }

+                                                   default => sub { {} } } }

 sub bind_filter  : ClassObjectAttr { initialize => {clone => 'scalar'} }

 sub fetch_filter : ClassObjectAttr { initialize => {clone => 'scalar'} }

@@ -213,7 +212,8 @@ sub execute {

     # Execute

     my $sth = $query->sth;

-    my $ret_val = $sth->execute(@$bind_values);

+    my $ret_val = eval{$sth->execute(@$bind_values)};

+    croak($@) if $@;

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

@@ -238,7 +238,7 @@ sub _build_bind_values {

     # binding values

     my @bind_values;

-    # Filter and sdd bind values

+    # Create bind values

     foreach my $key_info (@$key_infos) {

         my $filtering_key = $key_info->{key};

         my $access_keys = $key_info->{access_keys};

@@ -247,6 +247,7 @@ sub _build_bind_values {

         my $table        = $key_info->{table}        || '';

         my $column       = $key_info->{column}       || '';

+        my $found;

         ACCESS_KEYS :

         foreach my $access_key (@$access_keys) {

             my $root_params = $params;

@@ -278,7 +279,7 @@ sub _build_bind_values {

                             push @bind_values, scalar $root_params->{$key};

                         }

                     }

-                    return @bind_values;

+                    $found = 1;

                 }

                 if ($key eq 'ARRAY') {

@@ -290,8 +291,17 @@ sub _build_bind_values {

                 }

             }

         }

-        croak("Cannot find key");

+        

+        unless ($found) {

+            require Data::Dumper;

+            my $key_info_dump = Data::Dumper->Dump([$key_info], ['*key_info']);

+            my $params_dump    = Data::Dumper->Dump([$params], ['*params']);

+            croak("Key not found\n\n" . 

+                  "<Key information>\n$key_info_dump\n\n" .

+                  "<Your parameters>\n$params_dump\n");

+        }

     }

+    return \@bind_values;

 }

@@ -553,6 +563,8 @@ If tranzation is died, rollback is execute.

 Yuki Kimoto, C<< <kimoto.yuki at gmail.com> >>

+Github L<http://github.com/yuki-kimoto>

+

 =head1 COPYRIGHT & LICENSE

 Copyright 2009 Yuki Kimoto, all rights reserved.

@@ -105,30 +105,28 @@ $result = $dbi->execute($query);

 @rows = $result->fetch_all;

 is_deeply(\@rows, [[1, 2], [3, 4]], "$test : fetch_all_hash list context");

-__END__

-

 test 'Filter';

 $dbi->reconnect;

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

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

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

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

 $insert_query->bind_filter(sub {

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

-    if ($key eq 'key1') {

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

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

         return $value * 2;

     }

     return $value;

 });

-$DB::single = 1;

+

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

 ok($ret_val, "Insert success return value");

-$select_tmpl  = "select k1, k2 from table1";

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

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

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

 $select_query->fetch_filter(sub {

-    my ($key, $value);

-    if ($key eq 'key2') {

+    my ($key, $value, $type, $sth, $i) = @_;

+    if ($key eq 'key2' && $type =~ /char/ && $sth->can('execute') && $i == 1) {

         return $value * 3;

     }

     return $value;

@@ -136,7 +134,7 @@ $select_query->fetch_filter(sub {

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

 $rows = $result->fetch_all_hash;

-is_deeply($rows, {k1 => 2, k2 => 6}, "$test : bind_filter fetch_filter");

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

 __END__