@@ -1,3 +1,5 @@

+0.1680

+    - select, update, and delete where option can receive string where clause

 0.1679

     - added EXPERIMENTAL select() wrap option to support Oracle ROWNUM

 0.1678

@@ -265,7 +265,7 @@ sub dbh {

 }

 our %DELETE_ARGS

-  = map { $_ => 1 } @COMMON_ARGS, qw/where append allow_delete_all/;

+  = map { $_ => 1 } @COMMON_ARGS, qw/where append allow_delete_all param/;

 sub delete {

     my ($self, %args) = @_;

@@ -284,12 +284,19 @@ sub delete {

     my $append           = delete $args{append};

     my $allow_delete_all = delete $args{allow_delete_all};

     my $query_return     = delete $args{query};

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

     # Where

-    $where = $self->_where_to_obj($where);

-    

-    # Where clause

-    my $where_clause = $where->to_string;

+    my $where_clause = '';

+    if (ref $where) {

+        $where = $self->_where_to_obj($where);

+        $param = keys %$param ? $self->merge_param($param, $where->param)

+                              : $where->param;

+        

+        # String where

+        $where_clause = $where->to_string;

+    }

+    elsif ($where) { $where_clause = "where $where" }

     croak qq{"where" must be specified } . _subname

       if $where_clause eq '' && !$allow_delete_all;

@@ -307,7 +314,7 @@ sub delete {

     # Execute query

     return $self->execute(

         $query,

-        param => $where->param,

+        param => $param,

         table => $table,

         %args

     );

@@ -869,7 +876,7 @@ sub select {

     unshift @$tables, @{$self->_search_tables(join(' ', keys %$param) || '')};

     # Where

-    my $where_clause;

+    my $where_clause = '';

     if (ref $where) {

         $where = $self->_where_to_obj($where);

         $param = keys %$param ? $self->merge_param($param, $where->param)

@@ -878,9 +885,7 @@ sub select {

         # String where

         $where_clause = $where->to_string;

     }

-    else {

-        $where_clause = $where;

-    }

+    elsif ($where) { $where_clause = "where $where" }

     # Add table names in where clause

     unshift @$tables, @{$self->_search_tables($where_clause)};

@@ -1003,8 +1008,16 @@ sub update {

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

     # Where

-    $where = $self->_where_to_obj($where);

-    my $where_clause = $where->to_string;

+    my $where_clause = '';

+    if (ref $where) {

+        $where = $self->_where_to_obj($where);

+        $param = keys %$param ? $self->merge_param($param, $where->param)

+                              : $where->param;

+        

+        # String where

+        $where_clause = $where->to_string;

+    }

+    elsif ($where) { $where_clause = "where $where" }

     croak qq{"where" must be specified } . _subname

       if "$where_clause" eq '' && !$allow_update_all;

@@ -1013,9 +1026,6 @@ sub update {

     push @sql, "update $q$table$q $update_clause $where_clause";

     push @sql, $append if $append;

-    # Merge parameters

-    $param = $self->merge_param($param, $where->param);

-    

     # SQL

     my $sql = join(' ', @sql);

@@ -78,7 +78,7 @@ sub _build_query {

                              || $self->tags->{$tag_name};

             # Tag is not registered

-            croak qq{Tag "$tag_name" in "{a }" is not registered } . _subname

+            croak qq{Tag "$tag_name" is not registered } . _subname

               unless $tag;

             # Tag not sub reference

@@ -2151,8 +2151,6 @@ $dbi->select(

 };

 like($@, qr/array/);

-__END__

-

 test 'select() string where';

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

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

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

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

 $rows = $dbi->select(

     table => 'table1',

-    column => 'key1',

-    where => '{= key1} and {=key2}',

+    where => '{= key1} and {= key2}',

     param => {key1 => 1, key2 => 2}

 )->fetch_hash_all;

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

+

+test 'delete() string where';

+$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 => 2, key2 => 3});

+$dbi->delete(

+    table => 'table1',

+    where => '{= key1} and {= key2}',

+    param => {key1 => 1, key2 => 2}

+);

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

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

+

+

+test 'update() string where';

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

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

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

+$dbi->update(

+    table => 'table1',

+    param => {key1 => [5, 1], key2 => 2},

+    where => '{= key1} and {= key2}'

+);

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

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

@@ -87,7 +87,7 @@ eval{$builder->build_query('{? }')};

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

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

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

+like($@, qr/\QTag "a" is not registered/, "tag not exist");

 $builder->register_tag({

     q => 'string'