@@ -1,5 +1,6 @@

 0.1706

-    - DBIx::Custom::Query table and filters method is DEPRECATED!

+    - DBIx::Custom::Query table and filters attribute method and

+      filter method is DEPRECATED!

       because I think query object must have only the information

       for statement handle caching.

 0.1705

@@ -1110,7 +1110,7 @@ sub _create_query {

         # Create query

         if ($q) {

             $query = DBIx::Custom::Query->new($q);

-            $query->filters($self->filters);

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

         }

     }

@@ -1156,7 +1156,7 @@ sub _create_query {

     $query->sth($sth);

     # Set filters

-    $query->filters($self->filters);

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

     return $query;

 }

@@ -3113,23 +3113,28 @@ L<DBIx::Custom>

 L<DBIx::Custom::Model>

-    # Attribute method

+    # Attribute methods

     filter # will be removed at 2017/1/1

     name # will be removed at 2017/1/1

     type # will be removed at 2017/1/1

 L<DBIx::Custom::Query>

-    # Attribute method

+    # Attribute methods

     default_filter # will be removed at 2017/1/1

+    table # will be removed at 2017/1/1

+    filters # will be removed at 2017/1/1

+    

+    # Methods

+    filter # will be removed at 2017/1/1

 L<DBIx::Custom::QueryBuilder>

-    # Attribute method

+    # Attribute methods

     tags # will be removed at 2017/1/1

     tag_processors # will be removed at 2017/1/1

-    # Method

+    # Methods

     register_tag # will be removed at 2017/1/1

     register_tag_processor # will be removed at 2017/1/1

@@ -3139,7 +3144,7 @@ L<DBIx::Custom::QueryBuilder>

 L<DBIx::Custom::Result>

-    # Attribute method

+    # Attribute methods

     filter_check # will be removed at 2017/1/1

     # Methods

@@ -4,27 +4,37 @@ use Object::Simple -base;

 use Carp 'croak';

 use DBIx::Custom::Util '_subname';

-has [qw/sth filters/],

+has 'sth',

     sql => '',

-    tables => sub { [] },

     columns => sub { [] };

+# DEPRECATED!

+has 'default_filter';

+sub filters {

+    warn "DBIx::Custom::Query filters attribute method is DEPRECATED!";

+    my $self = shift;

+    if (@_) {

+        $self->{filters} = $_[0];

+        return $self;

+    }

+    return $self->{filters};

+}

+has  tables => sub { [] };

+

+#DEPRECATED!

 sub filter {

+    warn "DBIx::Custom::Query filter method is DEPRECATED!";

     my $self = shift;

-    

     if (@_) {

         my $filter = {};

-        

         if (ref $_[0] eq 'HASH') {

             $filter = $_[0];

         }

         else {

             my $ef = @_ > 1 ? [@_] : $_[0];

-            

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

                 my $column = $ef->[$i];

                 my $f = $ef->[$i + 1];

-                

                 if (ref $column eq 'ARRAY') {

                     foreach my $c (@$column) {

                         $filter->{$c} = $f;

@@ -35,32 +45,24 @@ sub filter {

                 }

             }

         }

-        

         foreach my $column (keys %$filter) {

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

-

             if  (exists $filter->{$column}

               && defined $fname

               && ref $fname ne 'CODE') 

             {

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

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

-              

-              $filter->{$column} = $self->filters->{$fname};

+                my $filters = $self->{filters} || {};

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

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

+                $filter->{$column} = $filters->{$fname};

             }

         }

-        

         $self->{filter} = {%{$self->filter}, %$filter};

-        

         return $self;

     }

-    

     return $self->{filter} ||= {};

 }

-# DEPRECATED!

-has 'default_filter';

-

 1;

 =head1 NAME

@@ -70,6 +72,9 @@ DBIx::Custom::Query - Query

 =head1 SYNOPSIS

     my $query = DBIx::Custom::Query->new;

+    my $sth = $query->sth;

+    my $sql = $query->sql;

+    my $columns = $query->columns;

 =head1 ATTRIBUTES

@@ -80,16 +85,6 @@ DBIx::Custom::Query - Query

 Column names.

-=head2 C<filter>

-

-    my $filter = $query->filter;

-    $query     = $query->filter(author => 'to_something',

-                                 title  => 'to_something');

-

-    $query     = $query->filter([qw/author title/] => 'to_something');

-

-Filters when parameter binding is executed.

-

 =head2 C<sql>

     my $sql = $query->sql;

@@ -6,7 +6,7 @@ use utf8;

 use Encode qw/encode_utf8 decode_utf8/;

 use Data::Dumper;

-$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

+#$SIG{__WARN__} = sub { warn $_[0] unless $_[0] =~ /DEPRECATED/};

 BEGIN {

     eval { require DBD::SQLite; 1 }