@@ -1,3 +1,7 @@

+0.1641

+  fix  bug : filter can't overwirite undef value.

+  add feature to apply_filter(). you can apply end filter.

+  add feature to apply_filter(). TABLE__COLUMN is filterded now.

 0.1640

   removed experimental DBIx::Custom::Table base() method

   table created by tabled method can call base_$method correponding to base_table's one

@@ -81,54 +81,45 @@ sub apply_filter {

     # Create filters

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

-                "TABLE, COLUMN1, {in => INFILTER1, out => OUTFILTER1}, " .

-                "COLUMN2, {in => INFILTER2, out => OUTFILTER2}, ...)";

+                "TABLE, COLUMN1, {in => INFILTER1, out => OUTFILTER1, end => ENDFILTER1}, " .

+                "COLUMN2, {in => INFILTER2, out => OUTFILTER2, end => ENDFILTER2}, ...)";

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

         # Column

         my $column = $cinfos[$i];

-        # Filter

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

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

-        foreach my $ftype (keys %$filter) {

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

+        # Filter info

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

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

+        foreach my $ftype (keys %$finfo) {

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

+                             || $ftype eq 'end'; 

         }

-        my $in_filter = $filter->{in};

-        my $out_filter = $filter->{out};

-        # Out filter

-        if (ref $out_filter eq 'CODE') {

-            $self->{filter}{out}{$table}{$column}

-              = $out_filter;

-            $self->{filter}{out}{$table}{"$table.$column"}

-              = $out_filter;

-        }

-        elsif (defined $out_filter) {

-            croak qq{Filter "$out_filter" is not registered}

-              unless exists $self->filters->{$out_filter};

+        foreach my $way (qw/in out end/) {

+            my $filter = $finfo->{$way};

-            $self->{filter}{out}{$table}{$column}

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

-            $self->{filter}{out}{$table}{"$table.$column"}

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

-        }

-        

-        # In filter

-        if (ref $in_filter eq 'CODE') {

-            $self->{filter}{in}{$table}{$column}

-              = $in_filter;

-            $self->{filter}{in}{$table}{"$table.$column"}

-              = $in_filter;

-        }

-        elsif (defined $in_filter) {

-            croak qq{Filter "$in_filter" is not registered}

-              unless exists $self->filters->{$in_filter};

-            $self->{filter}{in}{$table}{$column}

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

-            $self->{filter}{in}{$table}{"$table.$column"}

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

+            # State

+            my $state = !exists $finfo->{$way} ? 'not_exists'

+                      : !defined $filter        ? 'not_defined'

+                      : ref $filter eq 'CODE'   ? 'code'

+                      : 'name';

+            

+            next if $state eq 'not_exists';

+            

+            # Check filter

+            croak qq{Filter "$filter" is not registered}

+              if  $state eq 'name'

+               && ! exists $self->filters->{$filter};

+            

+            # Filter

+            my $f = $state eq 'not_defined' ? undef

+                  : $state eq 'code'        ? $filter

+                  : $self->filters->{$filter};

+            $self->{filter}{$way}{$table}{$column} = $f;

+            $self->{filter}{$way}{$table}{"$table.$column"} = $f;

+            $self->{filter}{$way}{$table}{"${table}__$column"} = $f;

         }

     }

@@ -345,13 +336,18 @@ sub execute{

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

-        # Auto in filter

-        my $in_filter = {};

+        # Result in and end filter

+        my $in_filter  = {};

+        my $end_filter = {};

         foreach my $table (@$tables) {

             $in_filter = {

                 %$in_filter,

                 %{$self->{filter}{in}{$table} || {}}

-            }

+            };

+            $end_filter = {

+                %$end_filter,

+                %{$self->{filter}{end}{$table} || {}}

+            };

         }

         # Result

@@ -360,7 +356,8 @@ sub execute{

             filters        => $self->filters,

             filter_check   => $self->filter_check,

             default_filter => $self->{default_in_filter},

-            filter         => $in_filter || {}

+            filter         => $in_filter || {},

+            end_filter     => $end_filter || {}

         );

         return $result;

@@ -1028,8 +1025,8 @@ and implements the following new ones.

     $dbi->apply_filter(

         $table,

-        $column1 => {in => $infilter1, out => $outfilter1}

-        $column2 => {in => $infilter2, out => $outfilter2}

+        $column1 => {in => $infilter1, out => $outfilter1, end => $endfilter1}

+        $column2 => {in => $infilter2, out => $outfilter2, end =. $endfilter2}

         ...,

     );

@@ -1045,7 +1042,13 @@ arguments.

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

          table => ['table1']

     );

-    

+

+You can use three name as column name.

+

+    1. column        : author

+    2. table.column  : book.author

+    3. table__column : book__author

+

 =head2 C<connect>

     my $dbi = DBIx::Custom->connect(data_source => "dbi:mysql:database=dbname",

@@ -36,7 +36,6 @@ Column names.

                                  title  => 'to_something'});

 Filters when parameter binding is executed.

-This overwrites C<default_filter>.

 =head2 C<sql>

@@ -20,7 +20,11 @@ sub filter {

         foreach my $column (keys %$filter) {

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

-            unless (ref $fname eq 'CODE') {

+

+            if  (exists $filter->{$column}

+              && defined $fname

+              && ref $fname ne 'CODE') 

+            {

               croak qq{Filter "$fname" is not registered"}

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

@@ -44,7 +48,11 @@ sub end_filter {

         foreach my $column (keys %$end_filter) {

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

-            unless (ref $fname eq 'CODE') {

+            

+            if  (exists $end_filter->{$column}

+              && defined $fname

+              && ref $fname ne 'CODE') 

+            {

               croak qq{Filter "$fname" is not registered"}

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

@@ -600,6 +600,21 @@ $result = $dbi->select(table => 'table1');

 $row   = $result->fetch_hash_first;

 is_deeply($row, {key1 => 6, key2 => 12}, "insert");

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

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

+$dbi->register_filter(twice => sub { $_[0] * 2 });

+$dbi->register_filter(three_times => sub { $_[0] * 3});

+$dbi->apply_filter(

+    'table1', 'key1' => {out => 'twice', in => 'three_times'}, 

+              'key2' => {out => 'three_times', in => 'twice'});

+$dbi->apply_filter(

+    'table1', 'key1' => {out => undef}

+); 

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

+$result = $dbi->execute($SELECT_SOURCES->{0});

+$row   = $result->fetch_hash_first;

+is_deeply($row, {key1 => 1, key2 => 6}, "insert");

+

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

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

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

@@ -852,6 +867,27 @@ $result->end_filter({key1 => sub { $_[0] * 3 }, key2 => 'five_times' });

 $row = $result->fetch_hash_first;

 is_deeply($row, {key1 => 6, key2 => 40});

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

+$dbi->apply_filter('table1',

+    key1 => {end => sub { $_[0] * 3 } },

+    key2 => {end => 'five_times'}

+);

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

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

+$row = $result->fetch_hash_first;

+is_deeply($row, {key1 => 6, key2 => 40}, 'apply_filter');

+

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

+$dbi->apply_filter('table1',

+    key1 => {end => sub { $_[0] * 3 } },

+    key2 => {end => 'five_times'}

+);

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

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

+$result->filter(key1 => undef);

+$result->end_filter(key1 => undef);

+$row = $result->fetch_hash_first;

+is_deeply($row, {key1 => 1, key2 => 40}, 'apply_filter overwrite');

 test 'empty where select';

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

@@ -1264,3 +1300,20 @@ is($table->three_times(1), 3, 'child table method');

 eval {$dbi->base_two};

 ok($@);

+test 'filter __ expression';

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

+$dbi->execute('create table company (id, name, location_id)');

+$dbi->execute('create table location (id, name)');

+$dbi->apply_filter('location',

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

+);

+

+$dbi->insert(table => 'company', param => {id => 1, name => 'a', location_id => 2});

+$dbi->insert(table => 'location', param => {id => 2, name => 'b'});

+

+$result = $dbi->select(

+    table => ['company', 'location'], relation => {'company.location_id' => 'location.id'},

+    column => ['location.name as location__name']

+);

+is($result->fetch_first->[0], 'B');

+