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

+0.1610

+  added check_filter attribute.

 0.1609

   updated document.

 0.1608

@@ -42,6 +42,8 @@ __PACKAGE__->attr(cache_method => sub {

     }

 });

+__PACKAGE__->attr(filter_check => 1);

+

 sub connect {

     my $proto = shift;

@@ -394,7 +396,8 @@ sub execute{

         my $result = $self->result_class->new(

             sth            => $sth,

             default_filter => $self->default_fetch_filter,

-            filters        => $self->filters

+            filters        => $self->filters,

+            filter_check   => $self->filter_check

         );

         return $result;

@@ -941,6 +944,8 @@ This is same as the following one.

     );

     $result->filter({title => 'decode_utf8', author => 'to_upper_case'});

+In fetch filter, column name must be lower case even if column conatain upper case charactor. This is requirment not to depend database systems.

+

 =head2 6. Performance

 If you execute insert statement by using select() method,

@@ -1151,6 +1156,16 @@ B<Example:>

         }

     );

+=head2 C<filter_check>

+

+    my $filter_check = $dbi->filter_check;

+    $dbi             = $dbi->filter_check(0);

+

+Enable filter check. 

+Default to 1.

+This check maybe damege performance.

+If you require performance, set C<filter_check> to 0.

+

 =head1 METHODS

 L<DBIx::Custom> inherits all methods from L<Object::Simple>

@@ -7,33 +7,38 @@ use base 'Object::Simple';

 use Carp 'croak';

-__PACKAGE__->attr([qw/sth filters default_filter filter/]);

+__PACKAGE__->attr([qw/sth filters default_filter filter filter_check/]);

 sub fetch {

     my $self = shift;

     # Filters

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

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

+    my $filters = $self->{filters} || {};

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

     # Fetch

     my @row = $self->{sth}->fetchrow_array;

     # No row

     return unless @row;

-

+    

+    # Check filter

+    $self->_check_filter($filters, $filter, 

+                         $self->default_filter, $self->sth)

+      if $self->{filter_check};

+    

     # Filtering

     my $columns = $self->{sth}->{NAME_lc};

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

         # Filter name

         my $column = $columns->[$i];

-        my $fname  = exists $self->{filter}->{$column}

-                   ? $self->{filter}->{$column}

+        my $fname  = exists $filter->{$column}

+                   ? $filter->{$column}

                    : $self->{default_filter};

         # Filtering

-        $row[$i] = $self->{filters}->{$fname}->($row[$i])

+        $row[$i] = $filters->{$fname}->($row[$i])

           if $fname;

     }

@@ -89,15 +94,20 @@ sub fetch_hash {

     my $self = shift;

     # Filters

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

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

+    my $filters = $self->{filters} || {};

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

     # Fetch

     my $row = $self->{sth}->fetchrow_arrayref;

     # Cannot fetch

     return unless $row;

-    

+

+    # Check filter

+    $self->_check_filter($filters, $filter, 

+                         $self->default_filter, $self->sth)

+      if $self->{filter_check};

+

     # Filter

     my $row_hash = {};

     my $columns = $self->{sth}->{NAME_lc};

@@ -105,13 +115,13 @@ sub fetch_hash {

         # Filter name

         my $column = $columns->[$i];

-        my $fname  = exists $self->{filter}->{$column}

-                   ? $self->{filter}->{$column}

+        my $fname  = exists $filter->{$column}

+                   ? $filter->{$column}

                    : $self->{default_filter};

         # Filtering

         $row_hash->{$column}

-          = $fname ? $self->{filters}->{$fname}->($row->[$i]) 

+          = $fname ? $filters->{$fname}->($row->[$i]) 

                    : $row->[$i];

     }

@@ -164,6 +174,30 @@ sub fetch_hash_all {

     return $rows;

 }

+sub _check_filter {

+    my ($self, $filters, $filter, $default_filter, $sth) = @_;

+    

+    # Filter name not exists

+    foreach my $fname (values %$filter) {

+        croak qq{Fetch filter "$fname" is not registered}

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

+    }

+    

+    # Default filter name not exists

+    croak qq{Default fetch filter "$default_filter" is not registered}

+      if $default_filter && ! exists $filters->{$default_filter};

+    

+    # Column name not exists

+    my %columns = map {$_ => 1} @{$self->sth->{NAME_lc}};

+    foreach my $column (keys %$filter) {

+        croak qq{Column name "$column" in fetch filter must lower case string}

+          unless $column eq lc $column;

+        

+        croak qq{Column name "$column" in fetch filter is not found in result columns}

+          unless $columns{$column};

+    }

+}

+

 1;

 =head1 NAME

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

 is(scalar keys %{$dbi->{_cached}}, 0, 'not cache');

+test 'filter_check in fetching';

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

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

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

+$dbi->default_fetch_filter('not_exists');

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

+eval{$result->fetch_first};

+like($@, qr/\QDefault fetch filter "not_exists" is not registered/, "$test : array :default_fetch_filter");

+

+$dbi->default_fetch_filter(undef);

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

+$result->filter({key1 => 'not_exists'});

+eval{$result->fetch_first};

+like($@, qr/\QFetch filter "not_exists" is not registered/, "$test :  array :fetch_filter");

+

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

+$result->filter({not_exists => 'encode_utf8'});

+eval{$result->fetch_first};

+like($@, qr/\QColumn name "not_exists" in fetch filter is not found in result columns/,

+     "$test :  array : fetch_filter");

+

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

+$result->filter({Key1 => 'encode_utf8'});

+eval{$result->fetch_first};

+like($@, qr/\QColumn name "Key1" in fetch filter must lower case string/,

+     "$test :  array : contain upper case charactor");

+

+$dbi->filter_check(0);

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

+$result->filter({Key1 => 'encode_utf8'});

+eval{$result->fetch_first};

+ok(!$@, "$test : array : filter_check off");

+

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

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

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

+$dbi->default_fetch_filter('not_exists');

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

+eval{$result->fetch_hash_first};

+like($@, qr/\QDefault fetch filter "not_exists" is not registered/, "$test : hash :default_fetch_filter");

+

+$dbi->default_fetch_filter(undef);

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

+$result->filter({key1 => 'not_exists'});

+eval{$result->fetch_hash_first};

+like($@, qr/\QFetch filter "not_exists" is not registered/, "$test : hash :fetch_filter");

+

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

+$result->filter({not_exists => 'encode_utf8'});

+eval{$result->fetch_hash_first};

+like($@, qr/\QColumn name "not_exists" in fetch filter is not found in result columns/,

+     "$test : hash : fetch_filter");

+

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

+$result->filter({Key1 => 'encode_utf8'});

+eval{$result->fetch_hash_first};

+like($@, qr/\QColumn name "Key1" in fetch filter must lower case string/,

+     "$test : hash : contain upper case charactor");

+

+$dbi->filter_check(0);

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

+$result->filter({Key1 => 'encode_utf8'});

+eval{$result->fetch_hash_first};

+ok(!$@, "$test : hash : filter_check off");

+

+

+test 'filter_check in binding parameter';

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

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

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

+

+

+

+