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

+0.1691

+    - fixed bug that type_rule from option can't receive filter name

 0.1690

     - use latest Object::Simple features

 0.1689

@@ -1028,18 +1028,19 @@ sub type_rule {

     if (@_) {

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

-        $type_rule->{from} = _array_to_hash($type_rule->{from});

+        

+        # Into

         $type_rule->{into} = _array_to_hash($type_rule->{into});

         $self->{type_rule} = $type_rule;

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

         $self->each_column(sub {

             my ($dbi, $table, $column, $column_info) = @_;

-            my $type = $column_info->{TYPE_NAME};

+            my $type_name = $column_info->{TYPE_NAME};

             if ($type_rule->{into} &&

-                (my $filter = $type_rule->{into}->{$type}))

+                (my $filter = $type_rule->{into}->{$type_name}))

             {

-                return unless exists $type_rule->{into}->{$type};

+                return unless exists $type_rule->{into}->{$type_name};

                 if  (defined $filter && ref $filter ne 'CODE') 

                 {

                     my $fname = $filter;

@@ -1053,6 +1054,19 @@ sub type_rule {

             }

         });

+

+        # From

+        $type_rule->{from} = _array_to_hash($type_rule->{from});

+        foreach my $data_type (keys %{$type_rule->{from} || {}}) {

+            my $fname = $type_rule->{from}{$data_type};

+            if (defined $fname && ref $fname ne 'CODE') {

+                croak qq{Filter "$fname" is not registered" } . _subname

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

+                

+                $type_rule->{from}{$data_type} = $self->filters->{$fname};

+            }

+        }

+        

         return $self;

     }

@@ -2654,6 +2654,21 @@ $row = $result->one;

 is($row->{key1}, 'A');

 is($row->{key2}, 'B');

+$dbi = DBIx::Custom->connect(dsn => 'dbi:SQLite:dbname=:memory:');

+$dbi->execute("create table table1 (key1 Date, key2 datetime)");

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

+$dbi->type_rule(

+    from => {

+        Date => 'twice',

+    },

+    into => {

+        Date => 'twice',

+    }

+);

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

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

+is($result->fetch->[0], 8);

+

 test 'type_rule_off';

 $dbi = DBIx::Custom->connect(dsn => 'dbi:SQLite:dbname=:memory:');

@@ -2789,4 +2804,9 @@ $result->end_filter(key1 => sub { $_[0] * 5});

 is_deeply($result->fetch_first,

           [1, 2, 1, 3]);

+

+test 'available_date_type';

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

+ok($dbi->can('available_data_type'));

+

 =cut

@@ -134,6 +134,12 @@ $dbi = DBIx::Custom->connect(

     password => $PASSWORD

 );

 eval{$dbi->execute("create table date_test (date DATE, datetime DATETIME)")};

+$dbi->each_column(

+    sub {

+        my ($self, $table, $column, $column_info) = @_;

+    }

+);

+

 $dbi->type_rule(

     into => {

         DATE=> sub {