@@ -100,15 +100,19 @@ sub auto_filter {

         my $bind_filter  = $c->[1];

         croak qq{"$bind_filter" is not registered}

           unless $self->filters->{$bind_filter};

-        $self->{_auto_bind_filter}{$table}{$column} = $bind_filter;

-        $self->{_auto_bind_filter}{$table}{"$table.$column"} = $bind_filter;

+        $self->{_auto_bind_filter}{$table}{$column}

+          = $self->filters->{$bind_filter};

+        $self->{_auto_bind_filter}{$table}{"$table.$column"}

+          = $self->filters->{$bind_filter};

         # Fetch filter

         my $fetch_filter = $c->[2];

         croak qq{"$fetch_filter" is not registered}

           unless $self->filters->{$fetch_filter};

-        $self->{_auto_fetch_filter}{$table}{$column} = $fetch_filter;

-        $self->{_auto_fetch_filter}{$table}{"$table.$column"} = $fetch_filter;

+        $self->{_auto_fetch_filter}{$table}{$column}

+          = $self->filters->{$fetch_filter};

+        $self->{_auto_fetch_filter}{$table}{"$table.$column"}

+          = $self->filters->{$fetch_filter};

     }

     return $self;

@@ -580,11 +584,6 @@ sub _build_bind_values {

     # Parameter

     $params ||= {};

-    # Check filter

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

-                         $self->default_bind_filter, $params)

-      if $self->filter_check;

-    

     # Build bind values

     my $count = {};

     foreach my $column (@{$query->columns}) {

@@ -596,7 +595,10 @@ sub _build_bind_values {

         # Filtering

         my $fname = $filter->{$column} || $self->default_bind_filter || '';

-        my $filter_func = $fname ? $self->filters->{$fname} : undef;

+        my $filter_func = ref $fname ? $fname

+                        : $fname ? $self->filters->{$fname}

+                        : undef;

+        

         push @bind_values, $filter_func

                          ? $filter_func->($value)

                          : $value;

@@ -608,20 +610,6 @@ sub _build_bind_values {

     return \@bind_values;

 }

-sub _check_filter {

-    my ($self, $filters, $filter, $default_filter, $params) = @_;

-    

-    # Filter name not exists

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

-        croak qq{Bind filter "$fname" is not registered}

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

-    }

-    

-    # Default filter name not exists

-    croak qq{Default bind filter "$default_filter" is not registered}

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

-}

-

 sub _croak {

     my ($self, $error, $append) = @_;

     $append ||= "";

@@ -854,10 +842,8 @@ Filter functions.

     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> attribute to 0.

+B<this attribute is now deprecated and has no mean

+because check is always done>. 

 =head2 C<password>

@@ -25,11 +25,6 @@ sub fetch {

     # 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++) {

@@ -41,7 +36,8 @@ sub fetch {

                    : $self->{default_filter};

         # Filtering

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

+        $row[$i] = ref $fname ? $fname->($row[$i]) 

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

           if $fname;

     }

@@ -89,11 +85,6 @@ sub fetch_hash {

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

@@ -107,8 +98,9 @@ sub fetch_hash {

         # Filtering

         $row_hash->{$column}

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

-                   : $row->[$i];

+          = ref $fname ? $fname->($row->[$i])

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

+          : $row->[$i];

     }

     return $row_hash;

@@ -179,20 +171,6 @@ sub fetch_multi {

     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};

-}

-

 1;

 =head1 NAME

@@ -453,61 +453,6 @@ $dbi->cache(0);

 $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");

-

-$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");

-

-$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 parameter binding';

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

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

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

-

-$dbi->default_bind_filter('not_exists');

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

-like($@, qr/\QDefault bind filter "not_exists" is not registered/, "$test : default_bind_filter");

-

-$dbi->default_bind_filter(undef);

-eval{$dbi->select(table => 'table1', filter => {key1 => 'not_exists'})};

-like($@, qr/\QBind filter "not_exists" is not registered/, "$test : bind_filter");

-

 test 'execute';

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

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