@@ -7,6 +7,7 @@ use Carp 'croak';

 use DBI;

 use DBI::Custom::SQL::Template;

 use DBI::Custom::Result;

+use DBI::Custom::Query;

 ### Class-Object Accessors

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

@@ -14,7 +15,7 @@ sub password    : ClassObjectAttr { initialize => {clone => 'scalar'} }

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

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

-sub dbi_option : ClassObjectAttr { initialize => {clone => 'hash', 

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

                                                   default => sub { {} } } }

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

@@ -81,7 +82,7 @@ sub connect {

     my $data_source = $self->data_source;

     my $user        = $self->user;

     my $password    = $self->password;

-    my $dbi_option  = $self->dbi_option;

+    my $dbi_options  = $self->dbi_options;

     my $dbh = DBI->connect(

         $data_source,

@@ -91,7 +92,7 @@ sub connect {

             RaiseError => 1,

             PrintError => 0,

             AutoCommit => 1,

-            %{$dbi_option || {} }

+            %{$dbi_options || {} }

         }

     );

@@ -154,7 +155,7 @@ sub create_query {

     my $query = $self->sql_template->create_query($template);

     # Create Query object;

-    my $query = DBI::Custom::Query->new($query);

+    $query = DBI::Custom::Query->new($query);

     # connect if not

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

@@ -173,7 +174,7 @@ sub execute {

     # Create query if First argument is template

     if (!ref $query) {

         my $template = $query;

-        $query = $sefl->create_query($tempalte);

+        $query = $self->create_query($template);

     }

     # Set bind filter

@@ -186,7 +187,8 @@ sub execute {

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

     # Execute

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

+    my $sth = $query->sth;

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

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

@@ -202,20 +204,22 @@ sub execute {

 sub _build_bind_values {

     my ($self, $query, $params) = @_;

-    my $bind_filter = $query->bind_filter;

-    my $no_filters_map  = $query->_no_filters_map || {};

+    

+    my $key_infos      = $query->key_infos;

+    my $bind_filter    = $query->bind_filter;

+    my $no_filters_map = $query->_no_filters_map || {};

     # binding values

     my @bind_values;

     # Filter and sdd bind values

-    foreach my $param_key_info (@$param_key_infos) {

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

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

+    foreach my $key_info (@$key_infos) {

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

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

-        my $original_key = $param_key_info->{original_key} || '';

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

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

+        my $original_key = $key_info->{original_key} || '';

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

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

         ACCESS_KEYS :

         foreach my $access_key (@$access_keys) {

@@ -314,17 +318,23 @@ Version 0.0101

     # Sample(PostgreSQL)

     $dbi->data_source("dbi:Pg:dbname=$database");

+    

+=head2 database

+

+    # Set and get database name

+    $self     = $dbi->database($database);

+    $database = $dbi->database;

-=head2 dbi_option

+=head2 dbi_options

     # Set and get DBI option

-    $self       = $dbi->dbi_option({$options => $value, ...});

-    $dbi_option = $dbi->dbi_option;

+    $self       = $dbi->dbi_options({$options => $value, ...});

+    $dbi_options = $dbi->dbi_options;

     # Sample

-    $dbi->dbi_option({PrintError => 0, RaiseError => 1});

+    $dbi->dbi_options({PrintError => 0, RaiseError => 1});

-dbi_option is used when you connect database by using connect.

+dbi_options is used when you connect database by using connect.

 =head2 sql_template

@@ -362,6 +372,12 @@ you can get DBI database handle if you need.

     # Sample

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

+=head2 no_filters

+

+    # Set and get no filter keys

+    $self       = $dbi->no_filters($no_filters);

+    $no_filters = $dbi->no_filters;

+

 =head2 result_class

     # Set and get resultset class

@@ -452,11 +468,16 @@ If database is already disconnected, this method do noting.

 add_filter add filter to filters

-=head2 query

+=head2 create_query

+    

+    # Create Query object from SQL template

+    my $query = $dbi->create_query($template);

+    

+=head2 execute

     # Parse SQL template and execute SQL

-    $result = $dbi->query($sql_template, $param);

-    $result = $dbi->query($sql_template, $param, $bind_filter);

+    $result = $dbi->query($query, $params);

+    $result = $dbi->query($template, $params); # Shorcut

     # Sample

     $result = $dbi->query("select * from authors where {= name} && {= age}", 

@@ -468,19 +489,6 @@ add_filter add filter to filters

 See also L<DBI::Custom::SQL::Template>

-=head2 query_raw_sql

-

-    # Execute SQL

-    $result = $dbi->query_raw_sql($sql, @bind_values);

-    

-    # Sample

-    $result = $dbi->query("select * from table where name = ?, 

-                          title = ?;", 'taro', 'perl');

-    

-    while (my @row = $result->fetch) {

-        # do something

-    }

-    

 =head2 run_tranzaction

     # Run tranzaction

@@ -491,6 +499,8 @@ See also L<DBI::Custom::SQL::Template>

 If tranzaction is success, commit is execute. 

 If tranzation is died, rollback is execute.

+

+

 =head1 AUTHOR

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

@@ -6,16 +6,16 @@ use DBI::Custom;

 use Scalar::Util qw/blessed/;

 use DBI::Custom::SQL::Template;

-my $sql_tmpl1 = DBI::Custom::SQL::Template->new->upper_case(0);

-my $sql_tmpl2 = DBI::Custom::SQL::Template->new->upper_case(1);

-my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

+my $sql_tmpl1 = DBI::Custom::SQL::Template->new->tag_start(0);

+my $sql_tmpl2 = DBI::Custom::SQL::Template->new->tag_start(1);

+my $sql_tmpl3 = DBI::Custom::SQL::Template->new->tag_start(2);

 {

     my $dbi = DBI::Custom->new(

         user => 'a',

         password => 'b',

         data_source => 'c',

-        dbi_option => {d => 1, e => 2},

+        dbi_options => {d => 1, e => 2},

         filters => {

             f => 3,

         },

@@ -25,7 +25,7 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

         sql_template => $sql_tmpl1,

     );

     is_deeply($dbi,{user => 'a', password => 'b', data_source => 'c', 

-                    dbi_option => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',

+                    dbi_options => {d => 1, e => 2}, filters => {f => 3}, bind_filter => 'f',

                     fetch_filter => 'g', result_class => 'g',

                     sql_template => $sql_tmpl1}, 'new');

@@ -43,7 +43,7 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

       ->user('a')

       ->password('b')

       ->data_source('c')

-      ->dbi_option({d => 1, e => 2})

+      ->dbi_options({d => 1, e => 2})

       ->filters(

           f => 3

       )

@@ -58,7 +58,7 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

         user => 'ao',

         password => 'bo',

         data_source => 'co',

-        dbi_option => {do => 10, eo => 20},

+        dbi_options => {do => 10, eo => 20},

         filters => {

             fo => 30,

         },

@@ -68,8 +68,8 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

         sql_template => $sql_tmpl1,

     );

     my $sql_tmpl = delete $dbi->{sql_template};

-    is($sql_tmpl->upper_case, 0);

-    is_deeply($dbi,{ user => 'ao', password => 'bo', data_source => 'co', dbi_option => {do => 10, eo => 20},

+    is($sql_tmpl->tag_start, 0);

+    is_deeply($dbi,{ user => 'ao', password => 'bo', data_source => 'co', dbi_options => {do => 10, eo => 20},

                     ,filters => {fo => 30}, bind_filter => 'fo', fetch_filter => 'go', result_class => 'ho',

                     }, 'new arguments');

@@ -82,12 +82,12 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

     is($dbi->user, 'a');

     is($dbi->password, 'b');

     is($dbi->data_source, 'c');

-    is_deeply($dbi->dbi_option, {d => 1, e => 2});

+    is_deeply($dbi->dbi_options, {d => 1, e => 2});

     is_deeply({$dbi->filters}, {f => 3});

     is($dbi->bind_filter, 'f');

     is($dbi->fetch_filter, 'g');

     is($dbi->result_class, 'DBI::Custom::Result');

-    is($dbi->sql_template->upper_case, 0);

+    is($dbi->sql_template->tag_start, 0);

     isa_ok($dbi, 'DBI::Custom::T1');

 }

@@ -103,12 +103,12 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

     is($dbi->user, 'a');

     is($dbi->password, 'b');

     is($dbi->data_source, 'c');

-    is_deeply($dbi->dbi_option, {d => 1, e => 2});

+    is_deeply($dbi->dbi_options, {d => 1, e => 2});

     is_deeply(scalar $dbi->filters, {f => 3});

     is($dbi->bind_filter, 'f');

     is($dbi->fetch_filter, 'g');

     is($dbi->result_class, 'DBI::Custom::Result');

-    is($dbi->sql_template->upper_case, 0);

+    is($dbi->sql_template->tag_start, 0);

     isa_ok($dbi, 'DBI::Custom::T1_2');

 }

@@ -123,7 +123,7 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

       ->user('ao')

       ->password('bo')

       ->data_source('co')

-      ->dbi_option({do => 10, eo => 20})

+      ->dbi_options({do => 10, eo => 20})

       ->filters(

         fo => 30

       )

@@ -140,12 +140,12 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

     is($dbi->user, 'ao');

     is($dbi->password, 'bo');

     is($dbi->data_source, 'co');

-    is_deeply($dbi->dbi_option, {do => 10, eo => 20});

+    is_deeply($dbi->dbi_options, {do => 10, eo => 20});

     is_deeply(scalar $dbi->filters, {fo => 30});

     is($dbi->bind_filter, 'fo');

     is($dbi->fetch_filter, 'go');

     is($dbi->result_class, 'ho');

-    is($dbi->sql_template->upper_case, 1);

+    is($dbi->sql_template->tag_start, 1);

     isa_ok($dbi, 'DBI::Custom::T1_3');

 }

@@ -155,7 +155,7 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

         user => 'a',

         password => 'b',

         data_source => 'c',

-        dbi_option => {d => 1, e => 2},

+        dbi_options => {d => 1, e => 2},

         filters => {

             f => 3,

         },

@@ -168,93 +168,13 @@ my $sql_tmpl3 = DBI::Custom::SQL::Template->new->upper_case(2);

     is($dbi->user, 'a');

     is($dbi->password, 'b');

     is($dbi->data_source, 'c');

-    is_deeply($dbi->dbi_option, {d => 1, e => 2});

+    is_deeply($dbi->dbi_options, {d => 1, e => 2});

     is_deeply({$dbi->filters}, {f => 3});

     is($dbi->bind_filter, 'f');

     is($dbi->fetch_filter, 'g');

     is($dbi->result_class, 'h');

-    is($dbi->sql_template->upper_case, 2);

+    is($dbi->sql_template->tag_start, 2);

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

 }

-{

-    my $dbi = DBI::Custom->new;

-    my $tmpl   = "select * from table where {= title};";

-    my $values = {title => 'a'};

-    my ($sql, @bind) = $dbi->_create_sql($tmpl, $values);

-    is($sql, "select * from table where title = ?;", 'sql template');

-    is_deeply(\@bind, ['a'], 'sql template bind' );

-}

-

-{

-    # Expand place holer

-    my $dbi = DBI::Custom->new;

-    my $tmpl   = "select * from table where {= k1} && {<> k2} && {< k3} && {> k4} && {>= k5} && {<= k6} && {like k7}";

-    my $values = {k1 => 'a', k2 => 'b', k3 => 'c', k4 => 'd', k5 => 'e', k6 => 'f', k7 => 'g'};

-    

-    $dbi->filters(filter => sub {

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

-        if ($key eq 'k1' && $value eq 'a') {

-            return uc $value;

-        }

-        return $value;

-    });

-    

-    my ($sql, @bind) = $dbi->_create_sql($tmpl, $values, $dbi->filters->{filter});

-    

-    is($sql, "select * from table where k1 = ? && k2 <> ? && k3 < ? && k4 > ? && k5 >= ? && k6 <= ? && k7 like ?;", 'sql template2');

-    is_deeply(\@bind, ['A', 'b', 'c', 'd', 'e', 'f', 'g'], 'sql template bind2' );

-}

-

-{

-    # Expand place holer upper case

-    my $dbi = DBI::Custom->new;

-    $dbi->sql_template->upper_case(1);

-    my $tmpl   = "select * from table where {like k7}";

-    my $values = {k7 => 'g'};

-    

-    my ($sql, @bind) = $dbi->_create_sql($tmpl, $values);

-    is($sql, "select * from table where k7 LIKE ?;", 'sql template2');

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

-}

-

-

-{

-    # Insert values

-    my $dbi = DBI::Custom->new;

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

-    my $values = {insert_values => {k1 => 'a', k2 => 'b'}};

-    

-    $dbi->filters(filter => sub {

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

-        if ($key eq 'k1' && $value eq 'a') {

-            return uc $value;

-        }

-        return $value;

-    });

-        

-    my ($sql, @bind) = $dbi->_create_sql($tmpl, $values, $dbi->filters->{filter});

-    is($sql, "insert into table (k1, k2) values (?, ?);");

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

-}

-

-{

-    # Update set

-    my $dbi = DBI::Custom->new;

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

-    my $values = {update_set => {k1 => 'a', k2 => 'b'}};

-

-    $dbi->filters(filter => sub {

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

-        if ($key eq 'k1' && $value eq 'a') {

-            return uc $value;

-        }

-        return $value;

-    });

-        

-    my ($sql, @bind) = $dbi->_create_sql($tmpl, $values, $dbi->filters->{filter});

-    is($sql, "update table set k1 = ?, k2 = ?;");

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

-}

-

@@ -13,142 +13,176 @@ BEGIN {

     use_ok('DBI::Custom');

 }

-package Test::DBI::Custom;

-use Object::Simple;

+# Function for test name

+my $test;

+sub test {

+    $test = shift;

+}

-sub dbi : Attr {}

+# Varialbe for test

+my $dbi;

+my $sth;

+my $tmpl;

+my $params;

+my $sql;

+my $result;

+my @rows;

+my $rows;

+

+

+# Prepare table

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

+$dbi->connect;

+$dbi->dbh->do("create table table1 (key1 char(255), key2 char(255))");

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

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

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

-sub new {

-    my $self = shift->SUPER::new;

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

-    

-    $dbi->connect;

-    $self->dbi($dbi);

-    return $self;

-}

-sub create_table {

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

-    $self->dbi->query_raw_sql($create_table);

-    return $self;

+__END__

+$result = $dbi->execute("select key1, key2 from table1");

+

+@rows = ();

+while (my $row = $result->fetch) {

+    push @rows, [@$row];

 }

+is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch');

+

+

+$result = $dbi->execute("select key1, key2 from table1");

-sub create_table1 {

-    my $self = shift;

-    $self->create_table("create table t1 (k1 char(255), k2 char(255), k3 char(255), k4 char(255), k5 char(255));");

-    return $self;

+@rows = ();

+while (my @row = $result->fetch) {

+    push @rows, [@row];

 }

+is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch list context');

-sub insert {

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

-    my $table = ref $params_list[0] ? '' : shift;

-    $table ||= 't1';

-    

-    foreach my $params (@values_list) {

-        my $sql = $self->dbi->execute(

-            "insert into $table {insert_values}", {insert_values => $params}

-        );

-    }

-    return $self;

+

+$result = $dbi->execute("select key1, key2 from table1;");

+

+@rows = ();

+while (my $row = $result->fetch_hash) {

+    push @rows, {%$row};

 }

+is_deeply(\@rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], 'fetch_hash');

-sub test {

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

-    $code->($self->dbi);

+

+$result = $dbi->execute("select key1, key2 from table1;");

+

+@rows = ();

+while (my %row = $result->fetch_hash) {

+    push @rows, {%row};

 }

+is_deeply(\@rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}], 'fetch hash list context');

-Object::Simple->build_class;

-package main;

-my $t = Test::DBI::Custom->new;

+$result = $dbi->execute("select key1, key2 from table1");

-$t->new->create_table1->insert({k1 => 1, k2 => 2}, {k1 => 3, k2 => 4})->test(sub {

-    my $dbi = shift;

-    

-    my $r;     # resultset

-    my @rows;

-    my $rows;

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    @rows = ();

-    while (my $row = $r->fetch) {

-        push @rows, [@$row];

+$rows = $result->fetch_all;

+is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all');

+

+

+$result = $dbi->execute("select key1, key2 from table1");

+

+@rows = $result->fetch_all;

+is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all list context');

+

+

+$result = $dbi->execute("select key1, key2 from table1");

+

+@rows = $result->fetch_all_hash;

+is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all_hash');

+

+

+$result = $dbi->execute("select key1, key2 from table1");

+

+@rows = $result->fetch_all;

+is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all_hash list context');

+

+

+$dbi->fetch_filter(sub {

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

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

+        return $value * 3;

     }

-    is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    @rows = ();

-    while (my @row = $r->fetch) {

-        push @rows, [@row];

+    return $value;

+});

+

+$result = $dbi->execute("select key1, key2 from table1");

+

+$rows = $result->fetch_all;

+

+is_deeply($rows, [[3, 2], [3, 4]], 'fetch_filter array');

+

+

+$result = $dbi->execute("select key1, key2 from table1");

+

+$rows = $result->fetch_all_hash;

+

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

+

+

+

+# Expand place holer

+my $dbi = DBI::Custom->new;

+my $tmpl   = "select * from table where {= key1} && {<> key2} && {< k3} && {> k4} && {>= k5} && {<= k6} && {like k7}";

+my $params = {key1 => 'a', key2 => 'b', k3 => 'c', k4 => 'd', k5 => 'e', k6 => 'f', k7 => 'g'};

+

+$dbi->filters(filter => sub {

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

+    if ($key eq 'key1' && $value eq 'a') {

+        return uc $value;

     }

-    is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch list context');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1;");

-    

-    @rows = ();

-    while (my $row = $r->fetch_hash) {

-        push @rows, {%$row};

+    return $value;

+});

+

+my ($sql, @bind_values) = $dbi->_create_sql($tmpl, $params, $dbi->filters->{filter});

+

+is($sql, "select * from table where key1 = ? && key2 <> ? && k3 < ? && k4 > ? && k5 >= ? && k6 <= ? && k7 like ?;", 'sql template2');

+is_deeply(\@bind, ['A', 'b', 'c', 'd', 'e', 'f', 'g'], 'sql template bind2' );

+

+# Expand place holer upper case

+my $dbi = DBI::Custom->new;

+$dbi->sql_template->upper_case(1);

+my $tmpl   = "select * from table where {like k7}";

+my $params = {k7 => 'g'};

+

+($sql, @bind_values) = $dbi->_create_sql($tmpl, $params);

+is($sql, "select * from table where k7 LIKE ?;", 'sql template2');

+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'}};

+

+$dbi->filters(filter => sub {

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

+    if ($key eq 'key1' && $value eq 'a') {

+        return uc $value;

     }

-    is_deeply(\@rows, [{k1 => 1, k2 => 2}, {k1 => 3, k2 => 4}], 'fetch_hash');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1;");

+    return $value;

+});

-    @rows = ();

-    while (my %row = $r->fetch_hash) {

-        push @rows, {%row};

+($sql, @bind_values) = $dbi->_create_sql($tmpl, $params, $dbi->filters->{filter});

+is($sql, "insert into table (key1, key2) values (?, ?);");

+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'}};

+

+$dbi->filters(filter => sub {

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

+    if ($key eq 'key1' && $value eq 'a') {

+        return uc $value;

     }

-    is_deeply(\@rows, [{k1 => 1, k2 => 2}, {k1 => 3, k2 => 4}], 'fetch hash list context');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    $rows = $r->fetch_all;

-    is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    @rows = $r->fetch_all;

-    is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all list context');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    @rows = $r->fetch_all_hash;

-    is_deeply($rows, [[1, 2], [3, 4]], 'fetch_all_hash');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    @rows = $r->fetch_all;

-    is_deeply(\@rows, [[1, 2], [3, 4]], 'fetch_all_hash list context');

-    

-    

-    $dbi->fetch_filter(sub {

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

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

-            return $value * 3;

-        }

-        return $value;

-    });

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    $rows = $r->fetch_all;

-    

-    is_deeply($rows, [[3, 2], [3, 4]], 'fetch_filter array');

-    

-    

-    $r = $dbi->execute("select k1, k2 from t1");

-    

-    $rows = $r->fetch_all_hash;

+    return $value;

+});

-    is_deeply($rows, [{k1 => 3, k2 => 2}, {k1 => 3, k2 => 4}], 'fetch_filter hash');

+($sql, @bind_values) = $dbi->_create_sql($tmpl, $params, $dbi->filters->{filter});

+is($sql, "update table set key1 = ?, key2 = ?;");

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

-});