@@ -1,4 +1,5 @@

 0.1639

+  improved delete() and update() where option. you can use DBIx::Custom::Where object

   added experimental not_exists()

 0.1638

   table object call dbi object method if not found method.

@@ -259,12 +259,15 @@ sub delete {

         push @$clause, "{= $_}" for keys %$where;

         $w = $self->where;

         $w->clause($clause);

+        $w->param($where);

     }

     else { $w = $where }

     croak qq{"where" must be hash refernce or DBIx::Custom::Where object}

       unless ref $w eq 'DBIx::Custom::Where';

+    $where = $w->param;

+    

     croak qq{"where" must be specified}

       if "$w" eq '' && !$allow_delete_all;

@@ -640,33 +643,34 @@ sub update {

     # Update keys

     my @update_keys = keys %$param;

-    # Where keys

-    my @where_keys = keys %$where;

-    

-    # Not exists where keys

-    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

     my $update_clause = '{update_param ' . join(' ', @update_keys) . '}';

+

+    # Where

+    my $w;

+    if (ref $where eq 'HASH') {

+        my $clause = ['and'];

+        push @$clause, "{= $_}" for keys %$where;

+        $w = $self->where;

+        $w->clause($clause);

+        $w->param($where);

+    }

+    else { $w = $where }

-    # Where clause

-    my $where_clause = '';

-    my $new_where = {};

+    croak qq{"where" must be hash refernce or DBIx::Custom::Where object}

+      unless ref $w eq 'DBIx::Custom::Where';

-    if (@where_keys) {

-        $where_clause = 'where ';

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

-        $where_clause =~ s/ and $//;

-    }

+    $where = $w->param;

+    

+    croak qq{"where" must be specified}

+      if "$w" eq '' && !$allow_update_all;

     # Source of SQL

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

+    my $source = "update $table $update_clause $w";

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

     # Rearrange parameters

-    foreach my $wkey (@where_keys) {

+    foreach my $wkey (keys %$where) {

         if (exists $param->{$wkey}) {

             $param->{$wkey} = [$param->{$wkey}]

@@ -280,6 +280,25 @@ like($@, qr/noexist/, "invalid argument");

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

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

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

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

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

+$where = $dbi->where;

+$where->clause(['and', '{= key1}', '{= key2}']);

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

+$dbi->update(table => 'table1', param => {key1 => 3}, where => $where);

+$result = $dbi->select(table => 'table1');

+is_deeply($result->fetch_hash_all, [{key1 => 3, key2 => 2}], 'delete() where');

+

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

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

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

+$where = $dbi->where;

+$where->clause(['and', '{= key2}']);

+$where->param({key2 => 2});

+$dbi->update(table => 'table1', param => {key1 => 3}, where => $where);

+$result = $dbi->select(table => 'table1');

+is_deeply($result->fetch_hash_all, [{key1 => 3, key2 => 2}], 'delete() where');

 test 'update_all';

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

@@ -326,6 +345,16 @@ is_deeply($rows, [{key1 => 3, key2 => 4}], "delete multi key");

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

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

+$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});

+$where = $dbi->where;

+$where->clause(['and', '{= key1}', '{= key2}']);

+$where->param({ke1 => 1, key2 => 2});

+$dbi->delete(table => 'table1', where => $where);

+$result = $dbi->select(table => 'table1');

+is_deeply($result->fetch_hash_all, [{key1 => 3, key2 => 4}], 'delete() where');

 test 'delete error';

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