@@ -9,3 +9,4 @@ blib/*

 *.tar.gz

 cover_db/*

 *.tmp

+t/*.db

@@ -1,3 +1,8 @@

+0.1612

+  add tests

+  updated document

+  removed DBIx::Custom::SQLite last_insert_rawid() mehtod(not backword compatible)

+  removed DBIx::Custom::MySQL last_insert_id() method(not backword compatible)

 0.1611

   renamed update tag to update_param

   renamed insert tag to insert_param

@@ -13,3 +13,4 @@

 \.gz$

 ^\.git

 ^cover_db/

+\.db$

@@ -93,7 +93,7 @@ sub insert {

     # Check arguments

     foreach my $name (keys %args) {

-        croak qq{"$name" is invalid name}

+        croak qq{"$name" is invalid argument}

           unless $VALID_INSERT_ARGS{$name};

     }

@@ -126,7 +126,7 @@ sub update {

     # Check arguments

     foreach my $name (keys %args) {

-        croak qq{"$name" is invalid name}

+        croak qq{"$name" is invalid argument}

           unless $VALID_UPDATE_ARGS{$name};

     }

@@ -134,7 +134,7 @@ sub update {

     my $table            = $args{table} || '';

     my $param            = $args{param} || {};

     my $where            = $args{where} || {};

-    my $append_statement = $args{append} || '';

+    my $append = $args{append} || '';

     my $filter           = $args{filter};

     my $allow_update_all = $args{allow_update_all};

@@ -145,7 +145,8 @@ sub update {

     my @where_keys = keys %$where;

     # Not exists where keys

-    croak qq{"where" must contain the pairs of column name and value}

+    croak qq{"where" argument must be specified and } .

+          qq{contains the pairs of column name and value}

       if !@where_keys && !$allow_update_all;

     # Update clause

@@ -157,16 +158,13 @@ sub update {

     if (@where_keys) {

         $where_clause = 'where ';

-        foreach my $where_key (@where_keys) {

-            

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

-        }

+        $where_clause .= "{= $_} and " for @where_keys;

         $where_clause =~ s/ and $//;

     }

-    # Template for update

+    # Source of SQL

     my $source = "update $table $update_clause $where_clause";

-    $source .= " $append_statement" if $append_statement;

+    $source .= " $append" if $append;

     # Rearrange parameters

     foreach my $wkey (@where_keys) {

@@ -184,7 +182,7 @@ sub update {

     # Execute query

     my $ret_val = $self->execute($source, param  => $param, 

-                                            filter => $filter);

+                                 filter => $filter);

     return $ret_val;

 }

@@ -199,14 +197,14 @@ sub delete {

     # Check arguments

     foreach my $name (keys %args) {

-        croak qq{"$name" is invalid name}

+        croak qq{"$name" is invalid argument}

           unless $VALID_DELETE_ARGS{$name};

     }

     # Arguments

     my $table            = $args{table} || '';

     my $where            = $args{where} || {};

-    my $append_statement = $args{append};

+    my $append = $args{append};

     my $filter           = $args{filter};

     my $allow_delete_all = $args{allow_delete_all};

@@ -214,26 +212,25 @@ sub delete {

     my @where_keys = keys %$where;

     # Not exists where keys

-    croak qq{Key-value pairs for where clause must be specified to "delete" second argument}

+    croak qq{"where" argument must be specified and } .

+          qq{contains the pairs of column name and value}

       if !@where_keys && !$allow_delete_all;

     # Where clause

     my $where_clause = '';

     if (@where_keys) {

         $where_clause = 'where ';

-        foreach my $wkey (@where_keys) {

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

-        }

+        $where_clause .= "{= $_} and " for @where_keys;

         $where_clause =~ s/ and $//;

     }

-    # Template for delete

+    # Source of SQL

     my $source = "delete from $table $where_clause";

-    $source .= " $append_statement" if $append_statement;

+    $source .= " $append" if $append;

     # Execute query

     my $ret_val = $self->execute($source, param  => $where, 

-                                            filter => $filter);

+                                 filter => $filter);

     return $ret_val;

 }

@@ -248,7 +245,7 @@ sub select {

     # Check arguments

     foreach my $name (keys %args) {

-        croak qq{"$name" is invalid name}

+        croak qq{"$name" is invalid argument}

           unless $VALID_SELECT_ARGS{$name};

     }

@@ -261,7 +258,7 @@ sub select {

     my $append   = $args{append};

     my $filter   = $args{filter};

-    # SQL template for select statement

+    # Source of SQL

     my $source = 'select ';

     # Column clause

@@ -342,9 +339,10 @@ sub create_query {

         my $builder = $self->query_builder;

         # Create query

-        $query = eval{$builder->build_query($source)};

-        croak $@ if $@;

-        

+        {

+            local $Carp::CarpLevel += 1;

+            $query = $builder->build_query($source);

+        }

         # Cache query

         $self->cache_method->($self, $source,

                              {sql     => $query->sql, 

@@ -353,8 +351,13 @@ sub create_query {

     }

     # Prepare statement handle

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

-    croak qq{$@ SQL: "$query->{sql}"} if $@;

+    my $sth;

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

+    if ($@) {

+        my $error = $@;

+        $error =~ s/\s+at\s+.*?\s+line\s+\d+.*$//s;

+        croak qq{$error. SQL: "$query->{sql}"};

+    }

     # Set statement handle

     $query->sth($sth);

@@ -369,13 +372,13 @@ sub execute{

     # Check arguments

     foreach my $name (keys %args) {

-        croak qq{"$name" is invalid name}

+        croak qq{"$name" is invalid argument}

           unless $VALID_EXECUTE_ARGS{$name};

     }

     my $params = $args{param} || {};

-    # First argument is SQL template

+    # First argument is the soruce of SQL

     $query = $self->create_query($query)

       unless ref $query;

@@ -386,8 +389,13 @@ sub execute{

     # Execute

     my $sth      = $query->sth;

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

-    croak $@ if $@;

+    my $affected;

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

+    if ($@) {

+        my $error = $@;

+        $error =~ s/\s+at\s+.*?\s+line\s+\d+.*$//s;

+        croak $error;

+    }

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

@@ -426,31 +434,14 @@ sub _build_bind_values {

     my $count = {};

     foreach my $column (@{$query->columns}) {

-        croak qq{"$column" is not exists in params}

-          unless exists $params->{$column};

-        

         # Value

         my $value = ref $params->{$column} eq 'ARRAY'

                   ? $params->{$column}->[$count->{$column} || 0]

                   : $params->{$column};

-        # Filter name

+        # Filtering

         my $fname = $filter->{$column} || $self->default_bind_filter || '';

-        

-        my $filter_func;

-        if ($fname) {

-            

-            if (ref $fname eq 'CODE') {

-                $filter_func = $fname;

-            }

-            else {

-                my $filters = $self->filters;

-                croak qq{Not exists filter "$fname"}

-                  unless exists $filters->{$fname};

-                $filter_func = $filters->{$fname};

-            }            

-        }

-        

+        my $filter_func = $fname ? $self->filters->{$fname} : undef;

         push @bind_values, $filter_func

                          ? $filter_func->($value)

                          : $value;

@@ -489,7 +480,7 @@ DBIx::Custom - DBI interface, having hash parameter binding and filtering system

 =cut

-our $VERSION = '0.1611';

+our $VERSION = '0.1612';

 =head1 STABILITY

@@ -28,8 +28,6 @@ sub connect {

     return $self->SUPER::connect;

 }

-sub last_insert_id { shift->dbh->{mysql_insertid} }

-

 1;

 =head1 NAME

@@ -100,11 +98,4 @@ This method overrides C<DBIx::Custom::connect()> method.

 You can specify all attributes of L<DBIx::Custom>

 and L<DBIx::Custom::MySQL>, such as C<database>, C<host>, C<port>.

-=head2 C<last_insert_id>

-

-    my $last_insert_id = $dbi->last_insert_id;

-

-Get last insert id.

-This is same as C<last_insert_id()> function in MySQL.

-

 =cut

@@ -137,7 +137,11 @@ sub _build_query {

               unless ref $tag_processor eq 'CODE';

             # Execute tag processor

-            my $r = $tag_processor->(@$tag_args);

+            my $r;

+            {

+                local $Carp::CarpLevel += 1;

+                $r = $tag_processor->(@$tag_args);

+            }

             # Check tag processor return value

             croak qq{Tag processor "$tag_name" must return [STRING, ARRAY_REFERENCE]}

@@ -27,7 +27,7 @@ sub expand_placeholder_tag {

     my $column = shift;

     # Check arguments

-    croak qq{Column must be specified in tag "{? }"}

+    croak qq{Column name must be specified in tag "{? }"}

       unless $column;

     return ['?', [$column]];

@@ -14,8 +14,9 @@ sub connect {

     my $self = ref $proto ? $proto : $proto->new(@_);

     # Data source

-    if (!$self->data_source && (my $database = $self->database)) {

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

+    my $database = $self->database;

+    if (!$self->data_source && $database) {

+        $self->data_source("dbi:SQLite:dbname=$database")

     }

     return $self->SUPER::connect;

@@ -33,8 +34,6 @@ sub connect_memory {

     return $self;

 }

-sub last_insert_rowid { shift->dbh->func('last_insert_rowid') }

-

 1;

 =head1 NAME

@@ -88,11 +87,4 @@ and L<DBIx::Custom::SQLite>, such as C<database>.

 Create a new L<DBIx::Custom::SQLite> object and connect to the memory database.

-=head2 C<last_insert_rowid>

-

-    my $last_insert_rowid = $dbi->last_insert_rowid;

-

-Get last insert row id.

-This is same as C<last_insert_rowid()> function in SQLite.

-

 =cut

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

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

 };

-my $SELECT_TMPLS = {

+my $SELECT_SOURCES = {

     0 => 'select * from table1;'

 };

@@ -45,9 +45,9 @@ my $dbi;

 my $sth;

 my $source;

 my @sources;

-my $select_tmpl;

-my $insert_tmpl;

-my $update_tmpl;

+my $select_SOURCE;

+my $insert_SOURCE;

+my $update_SOURCE;

 my $params;

 my $sql;

 my $result;

@@ -106,9 +106,9 @@ ok($ret_val, $test);

 test 'Direct query';

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

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

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

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

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

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

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows = $result->fetch_hash_all;

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

@@ -118,22 +118,22 @@ $dbi->execute($CREATE_TABLE->{0});

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

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

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

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

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

+$insert_query = $dbi->create_query($insert_SOURCE);

 $insert_query->filter({key1 => 'twice'});

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

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

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

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

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

 test 'Filter in';

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

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

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

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

+$insert_query = $dbi->create_query($insert_SOURCE);

 $dbi->execute($insert_query, param => {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_SOURCE = "select * from table1 where {in table1.key1 2} and {in table1.key2 2}";

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

 $select_query->filter({'table1.key1' => 'twice'});

 $result = $dbi->execute($select_query, param => {'table1.key1' => [1,5], 'table1.key2' => [2,4]});

 $rows = $result->fetch_hash_all;

@@ -171,23 +171,23 @@ is_deeply($rows, [{key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5}], "$te

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

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

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

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

+$insert_SOURCE = 'insert into table1 {insert_param key1 key2 key3 key4 key5}';

+$dbi->execute($insert_SOURCE, param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $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->execute("delete from table1");

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

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

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

+$insert_SOURCE = "insert into table1 {insert_param key1 key2 key3 key4 key5}";

+$dbi->execute($insert_SOURCE, param => {key1 => 1, key2 => 2, key3 => 3, key4 => 4, key5 => 5});

+$dbi->execute($insert_SOURCE, param => {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10});

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

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

+$update_SOURCE = 'update table1 {update_param key1 key2 key3 key4} where {= key5}';

+$dbi->execute($update_SOURCE, param => {key1 => 1, key2 => 1, key3 => 1, key4 => 1, key5 => 5});

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

+$result = $dbi->execute($SELECT_SOURCES->{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");

@@ -205,7 +205,7 @@ $dbi = DBIx::Custom->connect($NEW_ARGS->{0});

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

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

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

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

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

@@ -216,7 +216,7 @@ $dbi->register_filter(

 );

 $dbi->default_bind_filter('twice');

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

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

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

 $dbi->default_bind_filter(undef);

@@ -228,7 +228,7 @@ $rows = $dbi->select(table => 'table1')->fetch_hash_all;

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

 eval{$dbi->insert(table => 'table1', noexist => 1)};

-like($@, qr/noexist/, "$test: invalid name");

+like($@, qr/noexist/, "$test: invalid argument");

 test 'update';

@@ -237,7 +237,7 @@ $dbi->execute($CREATE_TABLE->{1});

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

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

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

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

+$result = $dbi->execute($SELECT_SOURCES->{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}],

@@ -247,19 +247,26 @@ $dbi->execute("delete from table1");

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

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

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

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

+$result = $dbi->execute($SELECT_SOURCES->{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->update(table => 'table1', param => {key2 => [12]}, where => {key2 => 2, key3 => 3});

+$result = $dbi->execute($SELECT_SOURCES->{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 : param is array ref");

+

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

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

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

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

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

               filter => {key2 => 'twice'});

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

+$result = $dbi->execute($SELECT_SOURCES->{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}],

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

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

 eval{$dbi->update(table => 'table1', noexist => 1)};

-like($@, qr/noexist/, "$test: invalid name");

+like($@, qr/noexist/, "$test: invalid argument");

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

 like($@, qr/where/, "$test: not contain where");

@@ -281,7 +288,7 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2, key3 => 3, key4

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

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

 $dbi->update_all(table => 'table1', param => {key2 => 10}, filter => {key2 => 'twice'});

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

+$result = $dbi->execute($SELECT_SOURCES->{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}],

@@ -294,7 +301,7 @@ $dbi->execute($CREATE_TABLE->{0});

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

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

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

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

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

@@ -303,7 +310,7 @@ $dbi->insert(table => 'table1', param => {key1 => 1, key2 => 2});

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

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

 $dbi->delete(table => 'table1', where => {key2 => 1}, filter => {key2 => 'twice'});

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

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

@@ -317,14 +324,14 @@ $rows = $dbi->select(table => 'table1')->fetch_hash_all;

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

 eval{$dbi->delete(table => 'table1', noexist => 1)};

-like($@, qr/noexist/, "$test: invalid name");

+like($@, qr/noexist/, "$test: invalid argument");

 test 'delete error';

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

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

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

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

+like($@, qr/"where" argument must be specified and contains the pairs of column name and value/,

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

 test 'delete_all';

@@ -333,7 +340,7 @@ $dbi->execute($CREATE_TABLE->{0});

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

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

 $dbi->delete_all(table => 'table1');

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

 $rows   = $result->fetch_hash_all;

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

@@ -385,7 +392,7 @@ $rows = $dbi->select(

 is_deeply($rows, [{table1_key1 => 1, table2_key1 => 1, key2 => 2, key3 => 5}], "$test : relation : no exists where");

 eval{$dbi->select(table => 'table1', noexist => 1)};

-like($@, qr/noexist/, "$test: invalid name");

+like($@, qr/noexist/, "$test: invalid argument");

 test 'fetch filter';

@@ -530,3 +537,20 @@ eval{$dbi->select(table => 'table1', filter => {not_exists => 'encode_utf8'})};

 like($@, qr/\QColumn name "not_exists" in bind filter is not found in paramters/,

      "$test : fetch_filter");

+test 'execute';

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

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

+eval{$dbi->execute('select * frm table1')};

+like($@, qr/\Qselect * frm table1;/, "$test : fail prepare");

+

+eval{$dbi->execute('select * from table1', no_exists => 1)};

+like($@, qr/\Q"no_exists" is invalid argument/, "$test : invald SQL");

+

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

+$dbi->dbh->disconnect;

+eval{$dbi->execute($query, param => {key1 => {a => 1}})};

+ok($@, "$test: execute fail");

+

+eval{$dbi->create_query('select * from table1 where {0 key1}')};

+like($@, qr/\Q.t /, "$test : caller spec");

+

@@ -30,18 +30,17 @@ sub connect_info {

 }

-# Constat variables for tests

-my $CLASS = 'DBIx::Custom::MySQL';

-

 # Varialbes for tests

 my $dbi;

+my $dbname;

 use DBIx::Custom::MySQL;

 test 'connect';

-$dbi = $CLASS->new(user => $USER, password => $PASSWORD,

-                    database => $DATABASE);

+$dbi = DBIx::Custom::MySQL->new(user => $USER, password => $PASSWORD,

+                    database => $DATABASE, host => 'localhost', port => '10000');

 $dbi->connect;

+like($dbi->data_source, qr/dbi:mysql:database=.*;host=localhost;port=10000;/, "$test : created data source");

 is(ref $dbi->dbh, 'DBI::db', $test);

 test 'attributes';

@@ -84,6 +84,8 @@ isa_ok($ret_val, 'DBIx::Custom::QueryBuilder');

 test "Tag processor error case";

 $builder = DBIx::Custom::QueryBuilder->new;

+eval{$builder->build_query('{? }')};

+like($@, qr/\QColumn name must be specified in tag "{? }"/, "$test : ? not arguments");

 eval{$builder->build_query("{a }")};

 like($@, qr/\QTag "a" in "{a }" is not registered/, "$test : tag_processor not exist");

@@ -44,7 +44,7 @@ $dbh->do("insert into table1 (key1, key2) values ('3', '4');");

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

-test 'fetch scalar context';

+test 'fetch';

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

 @rows = ();

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

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

 is_deeply(\@rows, [[1, 2], [3, 4]], $test);

-test 'fetch_hash scalar context';

+test 'fetch_hash';

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

 @rows = ();

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

@@ -77,6 +77,11 @@ is_deeply($row, {key1 => 1, key2 => 2}, "$test : row");

 $row = $result->fetch_hash;

 ok(!$row, "$test : finished");

+$result = query($dbh, 'create table table2 (key1, key2);');

+$result = query($dbh, 'select * from table2');

+$row = $result->fetch_hash_first;

+ok(!$row, "$test : no row fetch");

+

 test 'fetch_multi';

 $dbh->do("insert into table1 (key1, key2) values ('5', '6');");

@@ -51,13 +51,11 @@ ok(-f $db_file, "$test : database file");

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

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

 $dbi->dbh->disconnect;

+

 unlink $db_file if -f $db_file;

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

+ok($dbi, "$test : called from class name");

-test 'last_insert_rowid';

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

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

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

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

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

-is($dbi->last_insert_rowid, 2, "$test: second");

-$dbi->dbh->disconnect;

+unlink $db_file if -f $db_file;

+$dbi = DBIx::Custom::SQLite->connect(data_source => "dbi:SQLite:dbname=$db_file");

+ok($dbi, "$test : specified data source");