@@ -16,6 +16,7 @@ use DBIx::Custom::QueryBuilder;

 use DBIx::Custom::Where;

 use DBIx::Custom::Model;

 use DBIx::Custom::Tag;

+use DBIx::Custom::Util;

 use Encode qw/encode_utf8 decode_utf8/;

 __PACKAGE__->attr(

@@ -87,6 +88,7 @@ sub apply_filter {

     $self->{filter} ||= {};

     $self->{filter}{out} ||= {};

     $self->{filter}{in} ||= {};

+    $self->{filter}{end} ||= {};

     # Create filters

     my $usage = "Usage: \$dbi->apply_filter(" .

@@ -98,11 +100,18 @@ sub apply_filter {

         # Column

         my $column = $cinfos[$i];

+        if (ref $column eq 'ARRAY') {

+            foreach my $c (@$column) {

+                push @cinfos, $c, $cinfos[$i + 1];

+            }

+            next;

+        }

+        

         # Filter info

         my $finfo = $cinfos[$i + 1] || {};

-        croak $usage unless  ref $finfo eq 'HASH';

+        croak "$usage (table: $table)" unless  ref $finfo eq 'HASH';

         foreach my $ftype (keys %$finfo) {

-            croak $usage unless $ftype eq 'in' || $ftype eq 'out'

+            croak "$usage (table: $table 2)" unless $ftype eq 'in' || $ftype eq 'out'

                              || $ftype eq 'end'; 

         }

@@ -351,6 +360,7 @@ sub execute{

     # Applied filter

     my $filter = {};

+    

     my $tables = $query->tables;

     my $arg_tables = $args{table} || [];

     $arg_tables = [$arg_tables]

@@ -364,7 +374,8 @@ sub execute{

     }

     # Filter argument

-    my $f = $args{filter} || $query->filter || {};

+    my $f = DBIx::Custom::Util::array_filter_to_hash($args{filter})

+         || $query->filter || {};

     foreach my $column (keys %$f) {

         my $fname = $f->{$column};

         if (!defined $fname) {

@@ -773,7 +784,9 @@ sub include_model {

         $self->model($model->name, $model);

         # Apply filter

-        $self->apply_filter($model->table, %{$model->filter});

+        croak "${name_space}::$model_class filter must be array reference"

+          unless ref $model->filter eq 'ARRAY';

+        $self->apply_filter($model->table, @{$model->filter});

     }

     return $self;

 }

@@ -1075,23 +1088,23 @@ DBIx::Custom - DBI interface, having hash parameter binding and filtering system

     # Insert 

     $dbi->insert(table  => 'book',

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

-                 filter => {title => 'to_something'});

+                 filter => [title => 'to_something']);

     # Update 

     $dbi->update(table  => 'book', 

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

                  where  => {id => 5},

-                 filter => {title => 'to_something'});

+                 filter => [title => 'to_something']);

     # Update all

     $dbi->update_all(table  => 'book',

                      param  => {title => 'Perl'},

-                     filter => {title => 'to_something'});

+                     filter => [title => 'to_something']);

     # Delete

     $dbi->delete(table  => 'book',

                  where  => {author => 'Ken'},

-                 filter => {title => 'to_something'});

+                 filter => [title => 'to_something']);

     # Delete all

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

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

         where  => {author => 'Ken'},

         relation => {'book.id' => 'rental.book_id'},

         append => 'order by id limit 5',

-        filter => {title => 'to_something'}

+        filter => [title => 'to_something']

     );

     # Execute SQL

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

     # Execute SQL with hash binding and filtering

     $dbi->execute("select id from book where {= author} and {like title}",

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

-                  filter => {title => 'to_something'});

+                  filter => [title => 'to_something']);

     # Create query and execute it

     my $query = $dbi->create_query(

@@ -1331,8 +1344,8 @@ instead of suger methods.

 =head2 C<execute>

-    my $result = $dbi->execute($query,  param => $params, filter => \%filter);

-    my $result = $dbi->execute($source, param => $params, filter => \%filter);

+    my $result = $dbi->execute($query,  param => $params, filter => \@filter);

+    my $result = $dbi->execute($source, param => $params, filter => \@filter);

 Execute query or the source of SQL.

 Query is L<DBIx::Custom::Query> object.

@@ -1344,7 +1357,7 @@ or the count of affected rows if insert, update, delete statement is executed.

     $dbi->delete(table  => $table,

                  where  => \%where,

                  append => $append,

-                 filter => \%filter,

+                 filter => \@filter,

                  query  => 1);

 Execute delete statement.

@@ -1392,7 +1405,7 @@ You can also write arguments like this.

     $dbi->insert(table  => $table, 

                  param  => \%param,

                  append => $append,

-                 filter => \%filter,

+                 filter => \@filter,

                  query  => 1);

 Execute insert statement.

@@ -1594,7 +1607,7 @@ NOTE that you must pass array reference as C<where>.

                  param  => \%params,

                  where  => \%where,

                  append => $append,

-                 filter => \%filter,

+                 filter => \@filter,

                  query  => 1)

 Execute update statement.

@@ -1632,7 +1645,7 @@ C<columns> and C<primary_key> is automatically set.

     $dbi->update_all(table  => $table, 

                      param  => \%params,

-                     filter => \%filter,

+                     filter => \@filter,

                      append => $append);

 Execute update statement to update all rows.

@@ -13,7 +13,7 @@ push @DBIx::Custom::CARP_NOT, __PACKAGE__;

 __PACKAGE__->attr(

     ['dbi', 'name', 'table'],

     columns => sub { [] },

-    filter => sub { {} },

+    filter => sub { [] },

     primary_key => sub { [] },

     relation => sub { {} }

 );

@@ -13,7 +13,28 @@ sub filter {

     my $self = shift;

     if (@_) {

-        my $filter = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+        my $filter = {};

+        

+        if (ref $_[0] eq 'HASH') {

+            $filter = $_[0];

+        }

+        else {

+            my $ef = @_ > 1 ? [@_] : $_[0];

+            

+            for (my $i = 0; $i < @$ef; $i += 2) {

+                my $column = $ef->[$i];

+                my $f = $ef->[$i + 1];

+                

+                if (ref $column eq 'ARRAY') {

+                    foreach my $c (@$column) {

+                        $filter->{$c} = $f;

+                    }

+                }

+                else {

+                    $filter->{$column} = $f;

+                }

+            }

+        }

         foreach my $column (keys %$filter) {

             my $fname = $filter->{$column};

@@ -65,6 +86,8 @@ Column names.

     $query     = $query->filter(author => 'to_something',

                                  title  => 'to_something');

+    $query     = $query->filter([qw/author title/] => 'to_something');

+

 Filters when parameter binding is executed.

 =head2 C<sql>

@@ -6,6 +6,7 @@ use warnings;

 use base 'Object::Simple';

 use Carp 'croak';

+use DBIx::Custom::Util;

 __PACKAGE__->attr(

     [qw/filters sth/],

@@ -16,8 +17,17 @@ sub filter {

     my $self = shift;

     if (@_) {

-        my $filter = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+        my $filter = {};

+        if (ref $_[0] eq 'HASH') {

+            $filter = $_[0];

+        }

+        else {

+            $filter = DBIx::Custom::Util::array_filter_to_hash(

+                @_ > 1 ? [@_] : $_[0]

+            );

+        }

+                

         foreach my $column (keys %$filter) {

             my $fname = $filter->{$column};

@@ -44,7 +54,16 @@ sub end_filter {

     my $self = shift;

     if (@_) {

-        my $end_filter = ref $_[0] eq 'HASH' ? $_[0] : {@_};

+        my $end_filter = {};

+        

+        if (ref $_[0] eq 'HASH') {

+            $end_filter = $_[0];

+        }

+        else {

+            $end_filter = DBIx::Custom::Util::array_filter_to_hash(

+                @_ > 1 ? [@_] : $_[0]

+            );

+        }

         foreach my $column (keys %$end_filter) {

             my $fname = $end_filter->{$column};

@@ -339,9 +358,11 @@ and implements the following new ones.

 =head2 C<(experimental) end_filter>

-    $result    = $result->end_filter(title  => 'to_something',

+    $result = $result->end_filter(title  => 'to_something',

                                      author => 'to_something');

+    $result = $result->end_filter([qw/title author/] => 'to_something');

+

 End filters.

 These each filters is executed after the filters applied by C<apply_filter> of

 L<DBIx::Custom> or C<filter> method.

@@ -401,6 +422,8 @@ Row count must be specified.

     $result = $result->filter(title  => 'to_something',

                               author => 'to_something');

+    $result = $result->filter([qw/title author/] => 'to_something');

+

 Filters.

 These each filters override the filters applied by C<apply_filter> of

 L<DBIx::Custom>.

@@ -0,0 +1,35 @@

+package DBIx::Custom::Util;

+

+use strict;

+use warnings;

+

+sub array_filter_to_hash {

+    my $array_filter = shift;

+    

+    return unless $array_filter;

+    return $array_filter if ref $array_filter eq 'HASH';

+    

+    my $filter = {};

+    

+    for (my $i = 0; $i < @$array_filter; $i += 2) {

+        my $column = $array_filter->[$i];

+        my $f = $array_filter->[$i + 1];

+        

+        if (ref $column eq 'ARRAY') {

+            foreach my $c (@$column) {

+                $filter->{$c} = $f;

+            }

+        }

+        else {

+            $filter->{$column} = $f;

+        }

+    }

+    return $filter;

+}

+

+1;

+

+=head1 NAME

+

+DBIx::Custom::Util - Utility class

+

@@ -828,6 +828,24 @@ $result->end_filter(key1 => sub { $_[0] * 3 }, key2 => sub { $_[0] * 5 });

 $row = $result->fetch_first;

 is_deeply($row, [6, 40]);

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

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

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

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

+$result->filter([qw/key1 key2/] => sub { $_[0] * 2 });

+$result->end_filter([[qw/key1 key2/] => sub { $_[0] * 3 }]);

+$row = $result->fetch_first;

+is_deeply($row, [6, 12]);

+

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

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

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

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

+$result->filter([[qw/key1 key2/] => sub { $_[0] * 2 }]);

+$result->end_filter([qw/key1 key2/] => sub { $_[0] * 3 });

+$row = $result->fetch_first;

+is_deeply($row, [6, 12]);

+

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

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

 $result->filter(key1 => sub { $_[0] * 2 }, key2 => sub { $_[0] * 4 });

@@ -3,9 +3,9 @@ package MyModel6::table3;

 use base 'MyModel6';

 __PACKAGE__->attr(filter => sub {

-    {

+    [

         key1 => {in => sub { uc $_[0] }}

-    }

+    ]

 });

 1;