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

+0.1664

+    - where can recieve array refrence, which contains where cluase and paramter.

 0.1663

     - added EXPERIMENTAL type() attribute to DBIx::Custom::Model

     - added EXPERIMENTAL bind_param_option can set bind_param option

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

 package DBIx::Custom;

-our $VERSION = '0.1663';

+our $VERSION = '0.1664';

 use 5.008001;

 use strict;

@@ -260,20 +260,8 @@ sub delete {

     my $allow_delete_all = delete $args{allow_delete_all};

     # 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);

-    }

-    elsif (ref $where eq 'DBIx::Custom::Where') {

-        $w = $where;

-        $where = $w->param;

-    }    

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

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

+    my $w = $self->_where($where);

+    $where = $w->param;

     # String where

     my $swhere = "$w";

@@ -896,19 +884,8 @@ sub select {

     croak "Not found table name" unless $tables->[-1];

     # Where

-    my $w;

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

-        my $clause = ['and'];

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

-        $w = $self->where(clause => $clause, param => $where);

-    }

-    elsif (ref $where eq 'DBIx::Custom::Where') {

-        $w = $where;

-        $where = $w->param;

-    }

-    

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

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

+    my $w = $self->_where($where);

+    $where = $w->param;

     # String where

     my $swhere = "$w";

@@ -1041,21 +1018,8 @@ sub update {

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

     # 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);

-    }

-    elsif (ref $where eq 'DBIx::Custom::Where') {

-        $w = $where;

-        $where = $w->param;

-    }  

-    

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

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

+    my $w = $self->_where($where);

+    $where = $w->param;

     # String where

     my $swhere = "$w";

@@ -1329,6 +1293,32 @@ sub _push_join {

     }

 }

+sub _where {

+    my ($self, $where) = @_;

+    

+    my $w;

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

+        my $clause = ['and'];

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

+        $w = $self->where(clause => $clause, param => $where);

+    }

+    elsif (ref $where eq 'DBIx::Custom::Where') {

+        $w = $where;

+    }

+    elsif (ref $where eq 'ARRAY') {

+        $w = $self->where(

+            clause => $where->[0],

+            param  => $where->[1]

+        );

+    }

+    

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

+          qq{or array reference, which contains where clause and paramter}

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

+    

+    return $w;

+}

+

 # DEPRECATED!

 __PACKAGE__->attr(

     dbi_options => sub { {} },

@@ -1814,7 +1804,8 @@ Table name.

 =item C<where>

-Where clause. This is hash reference or L<DBIx::Custom::Where> object.

+Where clause. This is hash reference or L<DBIx::Custom::Where> object

+or array refrence, which contains where clause and paramter.

     # Hash reference

     $dbi->delete(where => {title => 'Perl'});

@@ -1826,6 +1817,14 @@ Where clause. This is hash reference or L<DBIx::Custom::Where> object.

     );

     $dbi->delete(where => $where);

+    # Array refrendce (where clause and parameter)

+    $dbi->delete(where =>

+        [

+            ['and', '{= author}', '{like title}'],

+            {author => 'Ken', title => '%Perl%'}

+        ]

+    );

+    

 =item C<append>

 Append statement to last of SQL. This is string.

@@ -2326,7 +2325,8 @@ You can add before created statement

 =item C<where>

-Where clause. This is hash reference or L<DBIx::Custom::Where> object.

+Where clause. This is hash reference or L<DBIx::Custom::Where> object,

+or array refrence, which contains where clause and paramter.

     # Hash reference

     $dbi->select(where => {author => 'Ken', 'title' => 'Perl'});

@@ -2338,6 +2338,14 @@ Where clause. This is hash reference or L<DBIx::Custom::Where> object.

     );

     $dbi->select(where => $where);

+    # Array refrendce (where clause and parameter)

+    $dbi->select(where =>

+        [

+            ['and', '{= author}', '{like title}'],

+            {author => 'Ken', title => '%Perl%'}

+        ]

+    );

+    

 =item C<join> EXPERIMENTAL

 Join clause used in need. This is array reference.

@@ -2505,7 +2513,8 @@ Update data. This is hash reference.

 =item C<where>

-Where clause. This is hash reference or L<DBIx::Custom::Where> object.

+Where clause. This is hash reference or L<DBIx::Custom::Where> object

+or array refrence.

     # Hash reference

     $dbi->update(where => {author => 'Ken', 'title' => 'Perl'});

@@ -2516,6 +2525,14 @@ Where clause. This is hash reference or L<DBIx::Custom::Where> object.

         param  => {author => 'Ken', title => '%Perl%'}

     );

     $dbi->update(where => $where);

+    

+    # Array refrendce (where clause and parameter)

+    $dbi->update(where =>

+        [

+            ['and', '{= author}', '{like title}'],

+            {author => 'Ken', title => '%Perl%'}

+        ]

+    );

 =item C<append>

@@ -156,7 +156,7 @@ C<delete_at()>,C<select_at()>.

 Database data type, this is used as type optioon of C<insert()>, C<insert_at()>,

 C<update()>, C<update_at()>, C<update_all>, C<delete()>, C<delete_all()>,

-C<select(), C<select_at()>

+C<select()>, C<select_at()>

 =head2 C<view>

@@ -298,7 +298,21 @@ $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');

+is_deeply($result->fetch_hash_all, [{key1 => 3, key2 => 2}], 'update() 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 => 3},

+    where => [

+        ['and', '{= key1}', '{= key2}'],

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

+    ]

+);

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

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

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

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

@@ -308,7 +322,7 @@ $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');

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

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

 like($@, qr/safety/);

@@ -372,6 +386,20 @@ $dbi->delete(table => 'table1', where => $where);

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

 is_deeply($result->fetch_hash_all, [{key1 => 3, key2 => 4}], 'delete() 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 => 3, key2 => 4});

+$dbi->delete(

+    table => 'table1',

+    where => [

+        ['and', '{= key1}', '{= key2}'],

+        {ke1 => 1, key2 => 2}

+    ]

+);

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

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

@@ -931,6 +959,16 @@ $result = $dbi->select(

 $row = $result->fetch_hash_all;

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

+$result = $dbi->select(

+    table => 'table1',

+    where => [

+        ['and', '{= key1}', '{= key2}'],

+        {key1 => 1}

+    ]

+);

+$row = $result->fetch_hash_all;

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

+

 $where = $dbi->where

              ->clause(['and', '{= key1}', '{= key2}'])

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