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

+0.1629

+  deprecated cache_method

 0.1628

   remove DBIx::Custom::Model

   move table method and table_class attribute to DBIx::Custom

@@ -20,21 +20,6 @@ __PACKAGE__->attr([qw/data_source dbh

                       dbi_options password user/]);

 __PACKAGE__->attr(cache => 1);

-__PACKAGE__->attr(cache_method => sub {

-    sub {

-        my $self = shift;

-        

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

-        

-        if (@_ > 1) {

-            $self->{_cached}{$_[0]} = $_[1] 

-        }

-        else {

-            return $self->{_cached}{$_[0]}

-        }

-    }

-});

-

 __PACKAGE__->attr(filters => sub {

     {

         encode_utf8 => sub { encode_utf8($_[0]) },

@@ -89,51 +74,51 @@ sub auto_filter {

         my @cs = @_;

         # Initialize filters

-        $self->{auto_filter}{bind} ||= {};

-        $self->{auto_filter}{fetch} ||= {};

+        $self->{auto_filter}{out} ||= {};

+        $self->{auto_filter}{in} ||= {};

         # Create auto filters

         foreach my $c (@cs) {

             croak "Usage \$dbi->auto_filter(" .

-                  "TABLE, [COLUMN, BIND_FILTER, FETCH_FILTER], [...])"

+                  "TABLE, [COLUMN, OUT_FILTER, IN_FILTER], [...])"

               unless ref $c eq 'ARRAY' && @$c == 3;

             # Column

             my $column = $c->[0];

             # Bind filter

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

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

-    	        $self->{auto_filter}{bind}{$table}{$column}

-    	          = $bind_filter;

-    	        $self->{auto_filter}{bind}{$table}{"$table.$column"}

-    	          = $bind_filter;

+            my $out_filter  = $c->[1];

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

+    	        $self->{auto_filter}{out}{$table}{$column}

+    	          = $out_filter;

+    	        $self->{auto_filter}{out}{$table}{"$table.$column"}

+    	          = $out_filter;

             }

             else {

-    	        croak qq{"$bind_filter" is not registered}

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

+    	        croak qq{"$out_filter" is not registered}

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

-    	        $self->{auto_filter}{bind}{$table}{$column}

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

-    	        $self->{auto_filter}{bind}{$table}{"$table.$column"}

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

+    	        $self->{auto_filter}{out}{$table}{$column}

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

+    	        $self->{auto_filter}{out}{$table}{"$table.$column"}

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

     	    }

             # Fetch filter

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

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

-    	        $self->{auto_filter}{fetch}{$table}{$column}

-    	          = $fetch_filter;

-    	        $self->{auto_filter}{fetch}{$table}{"$table.$column"}

-    	          = $fetch_filter;

+            my $in_filter = $c->[2];

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

+    	        $self->{auto_filter}{in}{$table}{$column}

+    	          = $in_filter;

+    	        $self->{auto_filter}{in}{$table}{"$table.$column"}

+    	          = $in_filter;

             }

             else {

-                croak qq{"$fetch_filter" is not registered}

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

-                $self->{auto_filter}{fetch}{$table}{$column}

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

-                $self->{auto_filter}{fetch}{$table}{"$table.$column"}

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

+                croak qq{"$in_filter" is not registered}

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

+                $self->{auto_filter}{in}{$table}{$column}

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

+                $self->{auto_filter}{in}{$table}{"$table.$column"}

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

             }

         }

@@ -252,48 +237,6 @@ sub create_query {

     return $query;

 }

-sub default_bind_filter {

-    my $self = shift;

-    

-    if (@_) {

-        my $fname = $_[0];

-        

-        if (@_ && !$fname) {

-            $self->{default_bind_filter} = undef;

-        }

-        else {

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

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

-        

-            $self->{default_bind_filter} = $self->filters->{$fname};

-        }

-        return $self;

-    }

-    

-    return $self->{default_bind_filter};

-}

-

-sub default_fetch_filter {

-    my $self = shift;

-    my $fname = $_[0];

-    

-    if (@_) {

-        if (@_ && !$fname) {

-            $self->{default_fetch_filter} = undef;

-        }

-        else {

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

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

-        

-            $self->{default_fetch_filter} = $self->filters->{$fname};

-        }

-        

-        return $self;

-    }

-    

-    return $self->{default_fetch_filter}

-}

-

 our %VALID_DELETE_ARGS

   = map { $_ => 1 } qw/auto_filter_table table where append filter allow_delete_all/;

@@ -373,7 +316,7 @@ sub execute{

     foreach my $table (@$auto_filter_tables) {

         $auto_filter = {

             %$auto_filter,

-            %{$self->{auto_filter}{bind}->{$table} || {}}

+            %{$self->{auto_filter}{in}->{$table} || {}}

         }

     }

@@ -390,34 +333,34 @@ sub execute{

     }

     $filter = {%$auto_filter, %$filter};

-    # Create bind value

-    my $bind_values = $self->_build_bind_values($query, $params, $filter);

+    # Create bind values

+    my $binds = $self->_build_binds($params, $query->columns, $filter);

     # Execute

     my $sth      = $query->sth;

     my $affected;

-    eval {$affected = $sth->execute(@$bind_values)};

+    eval {$affected = $sth->execute(@$binds)};

     $self->_croak($@) if $@;

     # Return resultset if select statement is executed

     if ($sth->{NUM_OF_FIELDS}) {

-        # Auto fetch filter

-        my $auto_fetch_filter = {};

-	    foreach my $table (@$auto_filter_tables) {

-	        $auto_fetch_filter = {

-	            %$auto_filter,

-	            %{$self->{auto_filter}{fetch}{$table} || {}}

-	        }

-	    }

+        # Auto in filter

+        my $auto_in_filter = {};

+	      foreach my $table (@$auto_filter_tables) {

+	          $auto_in_filter = {

+	              %$auto_filter,

+	              %{$self->{auto_filter}{in}{$table} || {}}

+	          }

+	      }

 		# Result

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

             sth            => $sth,

             filters        => $self->filters,

             filter_check   => $self->filter_check,

-            default_filter => $self->default_fetch_filter,

-            _auto_filter   => $auto_fetch_filter || {}

+            default_filter => $self->{default_in_filter},

+            _auto_filter   => $auto_in_filter || {}

         );

         return $result;

@@ -720,37 +663,31 @@ sub update {

 sub update_all { shift->update(allow_update_all => 1, @_) };

-sub _build_bind_values {

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

+sub _build_binds {

+    my ($self, $params, $columns, $filter) = @_;

-    # binding values

-    my @bind_values;

-

-    # Filter

-    $filter ||= {};

-    

-    # Parameter

-    $params ||= {};

+    # bind values

+    my @binds;

     # Build bind values

     my $count = {};

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

+    foreach my $column (@$columns) {

         # Value

         my $value = ref $params->{$column} eq 'ARRAY'

                   ? $params->{$column}->[$count->{$column} || 0]

                   : $params->{$column};

-        # Filtering

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

+        # Filter

+        my $f = $filter->{$column} || $self->{default_out_filter} || '';

-        push @bind_values, $f ? $f->($value) : $value;

+        push @binds, $f ? $f->($value) : $value;

         # Count up 

         $count->{$column}++;

     }

-    return \@bind_values;

+    return \@binds;

 }

 sub _croak {

@@ -772,6 +709,64 @@ sub _croak {

     }

 }

+# Deprecated

+__PACKAGE__->attr(cache_method => sub {

+    sub {

+        my $self = shift;

+        

+        $self->{_cached} ||= {};

+        

+        if (@_ > 1) {

+            $self->{_cached}{$_[0]} = $_[1] 

+        }

+        else {

+            return $self->{_cached}{$_[0]}

+        }

+    }

+});

+

+sub default_bind_filter {

+    my $self = shift;

+    

+    if (@_) {

+        my $fname = $_[0];

+        

+        if (@_ && !$fname) {

+            $self->{default_out_filter} = undef;

+        }

+        else {

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

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

+        

+            $self->{default_out_filter} = $self->filters->{$fname};

+        }

+        return $self;

+    }

+    

+    return $self->{default_out_filter};

+}

+

+sub default_fetch_filter {

+    my $self = shift;

+    my $fname = $_[0];

+    

+    if (@_) {

+        if (@_ && !$fname) {

+            $self->{default_in_filter} = undef;

+        }

+        else {

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

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

+        

+            $self->{default_in_filter} = $self->filters->{$fname};

+        }

+        

+        return $self;

+    }

+    

+    return $self->{default_in_filter}

+}

+

 1;

 =head1 NAME

@@ -907,30 +902,6 @@ See L<DBIx::Custom::Guides> for more details.

 Enable parsed L<DBIx::Custom::Query> object caching.

 Default to 1.

-=head2 C<cache_method>

-

-    $dbi          = $dbi->cache_method(\&cache_method);

-    $cache_method = $dbi->cache_method

-

-Method to set and get caches.

-

-B<Example:>

-

-    $dbi->cache_method(

-        sub {

-            my $self = shift;

-            

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

-            

-            if (@_ > 1) {

-                $self->{_cached}{$_[0]} = $_[1] 

-            }

-            else {

-                return $self->{_cached}{$_[0]}

-            }

-        }

-    );

-

 =head2 C<data_source>

     my $data_source = $dbi->data_source;

@@ -1076,18 +1047,6 @@ instead of suger methods.

     $dbi->execute($query, {author => 'Ken', title => '%Perl%'});

-=head2 C<(deprecated) default_bind_filter>

-

-    my $default_bind_filter = $dbi->default_bind_filter;

-    $dbi                    = $dbi->default_bind_filter($fname);

-

-Default filter when parameter binding is executed.

-

-=head2 C<(deprecated) default_fetch_filter>

-

-    my $default_fetch_filter = $dbi->default_fetch_filter;

-    $dbi = $dbi->default_fetch_filter($fname);

-

 =head2 C<execute>

     my $result = $dbi->execute($query,  param => $params, filter => \%filter);

@@ -1376,7 +1335,7 @@ Rollback is automatically done.

 Note that this is feature of L<DBIx::TransactionManager>

 L<DBIx::TransactionManager> is required.

-=head2 C<table>

+=head2 C<(experimental) table>

     $dbi->table('book',

         insert => sub { ... },

@@ -1406,6 +1365,42 @@ B<Example:>

                      param  => {author => 'taro'},

                      filter => {author => 'encode_utf8'});

+=head2 C<(deprecated) default_bind_filter>

+

+    my $default_bind_filter = $dbi->default_bind_filter;

+    $dbi                    = $dbi->default_bind_filter($fname);

+

+Default filter when parameter binding is executed.

+

+=head2 C<(deprecated) default_fetch_filter>

+

+    my $default_fetch_filter = $dbi->default_fetch_filter;

+    $dbi = $dbi->default_fetch_filter($fname);

+

+=head2 C<(deprecated) cache_method>

+

+    $dbi          = $dbi->cache_method(\&cache_method);

+    $cache_method = $dbi->cache_method

+

+Method to set and get caches.

+

+B<Example:>

+

+    $dbi->cache_method(

+        sub {

+            my $self = shift;

+            

+            $self->{_cached} ||= {};

+            

+            if (@_ > 1) {

+                $self->{_cached}{$_[0]} = $_[1] 

+            }

+            else {

+                return $self->{_cached}{$_[0]}

+            }

+        }

+    );

+

 =head1 STABILITY

 L<DBIx::Custom> is now stable. APIs keep backword compatible in the feature.

@@ -302,7 +302,7 @@ If you want to register filter, use C<register_filter()> method.

         }

     );

-C<encode_utf8> and C<decode_utf8> filter is registerd by default.

+

 You can specify these filters to C<filter> argument of C<execute()> method.

@@ -330,59 +330,11 @@ C<delete()>, C<delete_all()>, C<select()>.

         filter => {title => 'encode_utf8'}

     );

-Filter works each parmeter, but you prepare default filter for all parameters.

-

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

-

-C<filter()> argument overwrites this default filter.

-    

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

-    $dbi->insert(

-        table  => 'book',

-        param  => {title => 'Perl', author => 'Ken', price => 1000},

-        filter => {author => 'to_upper_case', price => undef}

-    );

-

-This is same as the following example.

-

-    $dbi->insert(

-        table  => 'book',

-        param  => {title => 'Perl', author => 'Ken', price => 1000},

-        filter => {title => 'encode_uft8' author => 'to_upper_case'}

-    );

-

 You can also specify filter when the row is fetched. This is reverse of bind filter.

     my $result = $dbi->select(table => 'book');

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

-Filter works each column value, but you prepare a default filter

-for all clumn value.

-

-    $dbi->default_fetch_filter('decode_utf8');

-

-C<filter()> method of L<DBIx::Custom::Result>

-overwrites this default filter.

-

-    $dbi->default_fetch_filter('decode_utf8');

-    my $result = $dbi->select(

-        table => 'book',

-        columns => ['title', 'author', 'price']

-    );

-    $result->filter({author => 'to_upper_case', price => undef});

-

-This is same as the following one.

-

-    my $result = $dbi->select(

-        table => 'book',

-        columns => ['title', 'author', 'price']

-    );

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

-

-Note that in fetch filter, column names must be lower case

-even if the column name conatains upper case charactors.

-This is requirment not to depend database systems.

-

 B<Filter examples>

 MySQL

@@ -439,25 +439,6 @@ C<delete()>、C<select()>

         filter => {title => 'encode_utf8'}

     );

-C<filter>で指定されたフィルタはそれぞれのパラメータの値に働きますが、

-すべてのパラメータのためのデフォルトのフィルタを設定することもできます。

-

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

-

-C<filter()>オプションで指定されたフィルタは、

-デフォルトのフィルタを上書きます。

-    

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

-    $dbi->insert(

-        table  => 'book',

-        param  => {title => 'Perl', author => 'Ken', price => 1000},

-        filter => {author => 'to_upper_case', price => undef}

-    );

-

-C<title>の値にはデフォルトのフィルタであるC<encode_utf8>が適用され

-C<author>の値にはC<to_upper_case>が適用されます。

-C<price>にはundefを設定しているのでフィルタが解除されます。

-

 B<フィルタのサンプル>

 MySQL

@@ -513,24 +494,6 @@ SQLite

     my $result = $dbi->select(table => 'book');

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

-フィルタはそれぞれの列の値に作用しますが、

-すべての列のためのデフォルのトフィルタを設定することもできます。

-

-    $dbi->default_fetch_filter('decode_utf8');

-

-C<filter>メソッドで設定されたフィルタはデフォルトのフィルタを上書きます。

-

-    $dbi->default_fetch_filter('decode_utf8');

-    my $result = $dbi->select(

-        table => 'book',

-        columns => ['title', 'author', 'price']

-    );

-    $result->filter({author => 'to_upper_case', price => undef});

-

-C<title>の値にはデフォルトのフィルタであるC<decode_utf8>が適用され

-C<author>の値にはC<to_upper_case>が適用されます。

-C<price>にはundefを設定しているのでフィルタが解除されます。

-

 フェッチのためのフィルタにおいて、

 たとえ、列名が大文字を含む場合であっても

 列名は小文字であることに注意してください。

@@ -538,18 +501,6 @@ C<price>にはundefを設定しているのでフィルタが解除されます

 =head2 6. パフォーマンスの改善

-=head3 フィルタのチェックを無効にする

-

-フィルタのチェックがデフォルトでは有効になっています。

-これは正しいフィルタ名が指定されているかどうかをチェック

-するためのものですが、ときにはパフォーマンスに影響を

-及ぼす可能性があります。

-

-フィルタのチェックを無効にするにはC<filter_check>

-に0を設定してください。

-

-    $dbi->filter_check(0);

-

 =head3 シュガーメソッドを使わない

 もしC<insert()>メソッドを使用してインサートを実行した場合、

@@ -588,46 +539,6 @@ C<insert()>メソッドは、SQL文とステートメントハンドルを

 C<execute>メソッドの第一引数にクエリオブジェトを渡すことができます。

 これはC<insert()>メソッドよりも高速です。

-=head3 キャッシング

-

-C<execute()>メソッドはデフォルトでSQL文への解析結果をキャッシュします。

-

-    $dbi->cache(1);

-

-キャッシングはメモリ上で行われますが、C<cache_method()>

-を使って変更することができます。これはキャッシュされるデータの保存と取得

-のためのメソッドを定義するのに利用されます。

-

-    $dbi->cache_method(sub {

-        sub {

-            my $self = shift;

-            

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

-            

-            # Set cache

-            if (@_ > 1) {

-                $self->{_cached}{$_[0]} = $_[1] 

-            }

-            

-            # Get cache

-            else {

-                return $self->{_cached}{$_[0]}

-            }

-        }

-    });

-

-最初の引数はL<DBIx::Custom>です。第二引数は、

-"select * from book where {= title} and {= author};";

-のようなSQL文の源です。

-第三引数は

-{sql => "select * from book where title = ? and author = ?",

- columns => ['title', 'author']}

-のような解析後のデータです。これはハッシュリファレンスである必要

-があります。

-もし引数がふたつより大きい場合は、このメソッドはキャッシュを保存

-するのに利用されます。そうでない場合はキャッシュを取得するのに

-利用されます。

-

 =head2 7. その他の機能

 =head3 トランザクション

@@ -9,27 +9,6 @@ use Carp 'croak';

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

-sub default_filter {

-    my $self = shift;

-    

-    if (@_) {

-        my $fname = $_[0];

-        if (@_ && !$fname) {

-            $self->{default_filter} = undef;

-        }

-        else {

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

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

-        

-            $self->{default_filter} = $self->filters->{$fname};

-        }

-        

-        return $self;

-    }

-    

-    return $self->{default_filter};

-}

-

 sub filter {

     my $self = shift;

@@ -210,6 +189,28 @@ sub fetch_multi {

     return $rows;

 }

+# Deprecated

+sub default_filter {

+    my $self = shift;

+    

+    if (@_) {

+        my $fname = $_[0];

+        if (@_ && !$fname) {

+            $self->{default_filter} = undef;

+        }

+        else {

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

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

+        

+            $self->{default_filter} = $self->filters->{$fname};

+        }

+        

+        return $self;

+    }

+    

+    return $self->{default_filter};

+}

+

 1;

 =head1 NAME

@@ -301,13 +302,6 @@ Statement handle of L<DBI>.

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

 and implements the following new ones.

-=head2 C<(deprecated) default_filter>

-

-    my $default_filter = $result->default_filter;

-    $result = $result->default_filter($filter);

-

-Default filter when a row is fetched.

-

 =head2 C<fetch>

     my $row = $result->fetch;

@@ -363,4 +357,11 @@ Row count must be specified.

     $result    = $result->filter(title  => 'decode_utf8',

                                  author => 'decode_utf8');

+=head2 C<(deprecated) default_filter>

+

+    my $default_filter = $result->default_filter;

+    $result = $result->default_filter($filter);

+

+Default filter when a row is fetched.

+

 =cut