@@ -1,7 +1,6 @@

 use Test::More;

 use strict;

 use warnings;

-use DBI qw/:sql_types/;

 BEGIN {

     eval { require DBD::SQLite; 1 }

@@ -24,11 +23,16 @@ our $CREATE_TABLE = {

     0 => 'create table table1 (key1 char(255), key2 char(255));'

 };

+our $SELECT_TMPL = {

+    0 => 'select key1, key2 from table1;'

+};

+

 my $dbi;

 my $sth;

 my $tmpl;

 my $select_tmpl;

 my $insert_tmpl;

+my $update_tmpl;

 my $params;

 my $sql;

 my $result;

@@ -37,10 +41,12 @@ my $rows;

 my $query;

 my $select_query;

 my $insert_query;

+my $update_query;

 my $ret_val;

+

 # Prepare table

 $dbi = DBI::Custom->new(data_source => 'dbi:SQLite:dbname=:memory:');

 $dbi->connect;

@@ -105,11 +111,19 @@ $result = $dbi->execute($query);

 @rows = $result->fetch_all;

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

+test 'Insert query return value';

+$dbi->reconnect;

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

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

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

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

+ok($ret_val, $test);

+

 test 'Filter';

 $dbi->reconnect;

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

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

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

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

 $insert_query->bind_filter(sub {

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

@@ -119,11 +133,9 @@ $insert_query->bind_filter(sub {

     return $value;

 });

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

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

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

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

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

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

 $select_query->fetch_filter(sub {

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

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

@@ -136,6 +148,27 @@ $result = $dbi->execute($select_query);

 $rows = $result->fetch_all_hash;

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

+$dbi->reconnect;

+$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 ($key, $value, $table, $column) = @_;

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

+        return $value * 3;

+    }

+    return $value;

+});

+

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

+

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

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

+$rows = $result->fetch_all_hash;

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

+

+

 __END__

 $dbi->fetch_filter(sub {

@@ -191,8 +224,8 @@ is_deeply(\@bind, ['g'], 'sql template bind2' );

 # Insert values

 $dbi = DBI::Custom->new;

-$tmpl   = "insert into table {insert_values}";

-$params = {insert_values => {key1 => 'a', key2 => 'b'}};

+$tmpl   = "insert into table {insert}";

+$params = {insert => {key1 => 'a', key2 => 'b'}};

 $dbi->filters(filter => sub {

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

@@ -208,8 +241,8 @@ is_deeply(\@bind, ['A', 'b'], 'sql template bind' );

 # Update set

 $dbi = DBI::Custom->new;

-$tmpl   = "update table {update_set}";

-$params = {update_set => {key1 => 'a', key2 => 'b'}};

+$tmpl   = "update table {update}";

+$params = {update => {key1 => 'a', key2 => 'b'}};

 $dbi->filters(filter => sub {

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