@@ -11,6 +11,7 @@ my $builder = Module::Build->new(

         'Test::More' => 0,

     },

     requires => {

+        'Encode'       => 0,

         'DBIx::Custom' => 0.0101

     },

     recommends => {

@@ -1,22 +1,24 @@

 package DBIx::Custom::Basic;

+use 5.008001;

 use base 'DBIx::Custom';

 use Encode qw/decode encode/;

 use warnings;

 use strict;

-our $VERSION = '0.0101';

+our $VERSION = '0.0201';

 my $class = __PACKAGE__;

 $class->add_filter(

-    default_bind_filter  => sub { encode('UTF-8', $_[1]) },

-    default_fetch_filter => sub { decode('UTF-8', $_[1]) }

+    encode_utf8 => sub {

+        my $value = shift;

+        utf8::upgrade($value) unless Encode::is_utf8($value);

+        return encode('UTF-8', $value);

+    },

+    decode_utf8 => sub { decode('UTF-8', shift) }

 );

-$class->bind_filter($class->filters->{default_bind_filter});

-$class->fetch_filter($class->filters->{default_fetch_filter});

-

 $class->add_format(

     'SQL99_date'        => '%Y-%m-%d',

     'SQL99_datetime'    => '%Y-%m-%d %H:%M:%S',

@@ -26,6 +28,13 @@ $class->add_format(

     'ISO-8601_time'     => '%H:%M:%S',

 );

+# Methods

+sub utf8_filter_on {

+    my $self = shift;

+    $self->bind_filter($self->filters->{encode_utf8});

+    $self->fetch_filter($self->filters->{decode_utf8});

+}

+

 1;

 =head1 NAME

@@ -34,7 +43,55 @@ DBIx::Custom::Basic - DBIx::Custom basic class

 =head1 VERSION

-Version 0.0101

+Version 0.0201

+

+=head1 FILTERS

+

+=head2 encode_utf8

+

+    # Encode to UTF-8 byte stream (utf8::upgrade is done if need)

+    $dbi->filters->{encode_utf8}->($value);

+    

+This filter is generally used as bind filter

+

+    $dbi->bind_filter($dbi->filters->{encode_utf8});

+

+=head2 decode_utf8

+

+    # Decode to perl internal string

+    $dbi->filters->{decode_utf8}->($value);

+    

+This filter is generally used as fetch filter

+

+    $dbi->fetch_filter($dbi->filters->{decode_utf8});

+

+=head2 FORMATS

+    

+strptime formats is available

+    

+    # format name        format

+    'SQL99_date'         '%Y-%m-%d',

+    'SQL99_datetime'     '%Y-%m-%d %H:%M:%S',

+    'SQL99_time'         '%H:%M:%S',

+    'ISO-8601_date'      '%Y-%m-%d',

+    'ISO-8601_datetime'  '%Y-%m-%dT%H:%M:%S',

+    'ISO-8601_time'      '%H:%M:%S',

+

+You get format as the following

+

+    my $format = $dbi->formats->{$format_name};

+

+=head1 METHOD

+

+=head2 utf8_filter_on

+

+    # Encode and decode utf8 filter on

+    $dbi->utf8_filter_on;

+

+This equel to

+

+    $dbi->bind_filter($dbi->filters->{encode_utf8});

+    $dbi->fetch_filter($dbi->filters->{decode_utf8});

 =head1 AUTHOR

@@ -49,12 +49,14 @@ use DBIx::Custom::Basic;

 test 'Filter';

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

-ok($dbi->filters->{default_bind_filter}, "$test : exists default_bind_filter");

-ok($dbi->filters->{default_fetch_filter}, "$test : exists default_fetch_filter");

-is($dbi->bind_filter, $dbi->filters->{default_bind_filter}, 'default bind filter');

-is($dbi->fetch_filter, $dbi->filters->{default_fetch_filter}, 'default fetch filter');

+ok($dbi->filters->{encode_utf8}, "$test : exists default_bind_filter");

+ok($dbi->filters->{decode_utf8}, "$test : exists default_fetch_filter");

+

+$dbi->utf8_filter_on;

+is($dbi->bind_filter, $dbi->filters->{encode_utf8}, 'default bind filter');

+is($dbi->fetch_filter, $dbi->filters->{decode_utf8}, 'default fetch filter');

 $decoded_str = 'あ';

-$encoded_str = $dbi->bind_filter->('', $decoded_str);

+$encoded_str = $dbi->bind_filter->($decoded_str);

 is($encoded_str, encode('UTF-8', $decoded_str), 'encode utf8');

 is($decoded_str, $dbi->fetch_filter->('', $encoded_str), "$test : fetch_filter");

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

 package DBIx::Custom::Result;

 use Object::Simple;

-our $VERSION = '0.0101';

+our $VERSION = '0.0201';

 use Carp 'croak';

@@ -34,7 +34,7 @@ sub fetch {

         my $types = $sth->{TYPE};

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

             next if $self->_no_fetch_filters_map->{$keys->[$i]};

-            $row->[$i]= $fetch_filter->($keys->[$i], $row->[$i], $types->[$i],

+            $row->[$i]= $fetch_filter->($row->[$i], $keys->[$i], $types->[$i],

                                         $sth, $i);

         }

     }

@@ -66,7 +66,7 @@ sub fetch_hash {

             }

             else {

                 $row_hash->{$keys->[$i]}

-                  = $fetch_filter->($keys->[$i], $row->[$i],

+                  = $fetch_filter->($row->[$i], $keys->[$i],

                                     $types->[$i], $sth, $i);

             }

         }

@@ -198,7 +198,7 @@ DBIx::Custom::Result - Resultset for DBIx::Custom

 =head1 VERSION

-Version 0.0101

+Version 0.0201

 =head1 SYNOPSIS

@@ -208,7 +208,7 @@ is_deeply(\@rows, [[1, 2], [3, 4]], $test);

 test 'fetch filter';

 $fetch_filter = sub {

-    my ($key, $value, $type, $sth, $i) = @_;

+    my ($value, $key, $type, $sth, $i) = @_;

     if ($key eq 'key1' && $value == 1 && $type =~ /char/i && $i == 0 && $sth->{TYPE}->[$i] eq $type) {

         return $value * 3;

     }

@@ -323,8 +323,8 @@ sub _build_bind_values {

                             !$no_bind_filters_map->{$original_key})

                         {

                             push @bind_values, 

-                                 $bind_filter->($original_key, 

-                                                $root_params->[$current_key->[0]],

+                                 $bind_filter->($root_params->[$current_key->[0]], 

+                                                $original_key,

                                                 $table, $column);

                         }

                         # Not filtering

@@ -344,8 +344,8 @@ sub _build_bind_values {

                             !$no_bind_filters_map->{$original_key}) 

                         {

                             push @bind_values,

-                                 $bind_filter->($original_key,

-                                                $root_params->{$current_key}, 

+                                 $bind_filter->($root_params->{$current_key},

+                                                $original_key,

                                                 $table, $column);

                         }

                         # Not filtering

@@ -163,7 +163,7 @@ $insert_tmpl = "insert into table1 {insert key1 key2}";

 $dbi->execute($insert_tmpl, {key1 => 1, key2 => 2}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         if ($key eq 'key2') {

             return $value + 1;

         }

@@ -182,7 +182,7 @@ $dbi->do($CREATE_TABLE->{0});

 $insert_tmpl  = "insert into table1 {insert key1 key2};";

 $insert_query = $dbi->create_query($insert_tmpl);

 $insert_query->bind_filter(sub {

-    my ($key, $value, $table, $column) = @_;

+    my ($value, $key, $table, $column) = @_;

     if ($key eq 'key1' && $table eq '' && $column eq 'key1') {

         return $value * 2;

     }

@@ -191,7 +191,7 @@ $insert_query->bind_filter(sub {

 $dbi->execute($insert_query, {key1 => 1, key2 => 2});

 $select_query = $dbi->create_query($SELECT_TMPL->{0});

 $select_query->fetch_filter(sub {

-    my ($key, $value, $type, $sth, $i) = @_;

+    my ($value, $key, $type, $sth, $i) = @_;

     if ($key eq 'key2' && $type =~ /char/ && $sth->can('execute') && $i == 1) {

         return $value * 3;

     }

@@ -214,7 +214,7 @@ $dbi->do($CREATE_TABLE->{0});

 $insert_tmpl  = "insert into table1 {insert table1.key1 table1.key2}";

 $insert_query = $dbi->create_query($insert_tmpl);

 $insert_query->bind_filter(sub {

-    my ($key, $value, $table, $column) = @_;

+    my ($value, $key, $table, $column) = @_;

     if ($key eq 'table1.key1' && $table eq 'table1' && $column eq 'key1') {

         return $value * 3;

     }

@@ -233,7 +233,7 @@ $dbi->execute($insert_query, {key1 => 2, key2 => 4});

 $select_tmpl = "select * from table1 where {in table1.key1 2} and {in table1.key2 2}";

 $select_query = $dbi->create_query($select_tmpl);

 $select_query->bind_filter(sub {

-    my ($key, $value, $table, $column) = @_;

+    my ($value, $key, $table, $column) = @_;

     if ($key eq 'table1.key1' && $table eq 'table1' && $column eq 'key1' || $key eq 'table1.key2') {

         return $value * 2;

     }

@@ -484,7 +484,7 @@ $dbi->do('delete from table1');

 $dbi->insert('table1', {key1 => 1, key2 => 2}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         if ($key eq 'key1') {

             return $value * 3;

         }

@@ -532,7 +532,7 @@ $dbi->insert('table1', {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10})

 $dbi->update('table1', {key2 => 11}, {key1 => 1}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         if ($key eq 'key2') {

             return $value * 2;

         }

@@ -570,7 +570,7 @@ $dbi->insert('table1', {key1 => 6, key2 => 7, key3 => 8, key4 => 9, key5 => 10})

 $dbi->update_all('table1', {key2 => 10}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         return $value * 2;

     })

 });

@@ -597,7 +597,7 @@ $dbi->insert('table1', {key1 => 3, key2 => 4});

 $dbi->delete('table1', {key2 => 1}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         return $value * 2;

     });

 });

@@ -660,7 +660,7 @@ is_deeply($rows, [{key1 => 3, key2 => 4}], "$test : append statement");

 $rows = $dbi->select('table1', {key1 => 2}, sub {

     my $query = shift;

     $query->bind_filter(sub {

-        my ($key, $value) = @_;

+        my ($value, $key) = @_;

         if ($key eq 'key1') {

             return $value - 1;

         }