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

 0.1710

-    - Fixed fisrt where clause failed.

+    - Fixed fisrt executed where clause failed in some condition.

 0.1709

     - fixed named placeholder bug and added escape syntax

 0.1708

@@ -448,7 +448,7 @@ sub execute {

         # Result

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

             sth => $sth,

-            filters => $self->filters,

+            dbi => $self,

             default_filter => $self->{default_in_filter},

             filter => $filter->{in} || {},

             end_filter => $filter->{end} || {},

@@ -1073,16 +1073,7 @@ sub update_param {

     return $tag;

 }

-sub where {

-    my $self = shift;

-    

-    # Create where

-    return DBIx::Custom::Where->new(

-        quote => $self->_quote,

-        dbi => $self,

-        @_

-    );

-}

+sub where { DBIx::Custom::Where->new(dbi => shift, @_) }

 sub _create_query {

@@ -5,9 +5,8 @@ use overload

   '""'     => sub { shift->to_string },

   fallback => 1;

-

-has orders => sub { [] },

-    dbi => '';

+has 'dbi',

+    orders => sub { [] };

 sub prepend {

     my $self = shift;

@@ -57,9 +56,15 @@ DBIx::Custom::Order - Order by EXPERIMENTAL

     $order->prepend('title', 'author desc');

     my $order_by = "$order";

-

 =head1 ATTRIBUTES

+=head2 C<dbi>

+

+    my $dbi = $order->dbi;

+    $order = $order->dbi($dbi);

+

+L<DBIx::Custom> object.

+

 =head2 C<orders>

     my $orders = $result->orders;

@@ -4,7 +4,7 @@ use Object::Simple -base;

 use Carp 'croak';

 use DBIx::Custom::Util qw/_array_to_hash _subname/;

-has [qw/filters sth/],

+has [qw/dbi sth/],

     stash => sub { {} };

 *all = \&fetch_hash_all;

@@ -25,8 +25,8 @@ sub filter {

               && ref $fname ne 'CODE') 

             {

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

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

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

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

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

             }

         }

@@ -238,9 +238,9 @@ sub type_rule {

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

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

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

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

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

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

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

                 }

             }

         }

@@ -307,8 +307,8 @@ sub end_filter {

               && ref $fname ne 'CODE') 

             {

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

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

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

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

+              $end_filter->{$column} = $self->dbi->filters->{$fname};

             }

         }

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

@@ -341,8 +341,8 @@ sub default_filter {

         }

         else {

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

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

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

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

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

         }

         return $self;

     }

@@ -390,12 +390,12 @@ DBIx::Custom::Result - Result of select statement

 =head1 ATTRIBUTES

-=head2 C<filters>

+=head2 C<dbi>

-    my $filters = $result->filters;

-    $result = $result->filters(\%filters);

+    my $dbi = $result->dbi;

+    $result = $result->dbi($dbi);

-Filters.

+L<DBIx::Custom> object.

 =head2 C<sth>

@@ -9,7 +9,7 @@ use overload '""' => sub { shift->to_string }, fallback => 1;

 # Carp trust relationship

 push @DBIx::Custom::CARP_NOT, __PACKAGE__;

-has [qw/dbi param quote/],

+has [qw/dbi param/],

     clause => sub { [] };

 sub new {

@@ -106,7 +106,7 @@ sub _parse {

         # Remove quote

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

-        if (my $q = $self->quote) {

+        if (my $q = $self->dbi->_quote) {

             $q = quotemeta($q);

             $column =~ s/[$q]//g;

         }

@@ -15,13 +15,15 @@ BEGIN {

     use_ok('DBIx::Custom::Result');

 }

+use DBIx::Custom;

+

 sub test { print "# $_[0]\n" }

 sub query {

     my ($dbh, $sql) = @_;

     my $sth = $dbh->prepare($sql);

     $sth->execute;

-    return DBIx::Custom::Result->new(sth => $sth);

+    return DBIx::Custom::Result->new(dbi => DBIx::Custom->new, sth => $sth);

 }

 my $dbh;

@@ -141,14 +143,14 @@ is_deeply($rows, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

 test 'fetch filter';

 $result = query($dbh, $sql);

-$result->filters({three_times => sub { $_[0] * 3}});

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

 $result->filter({key1 => 'three_times'});

 $rows = $result->fetch_all;

 is_deeply($rows, [[3, 2], [9, 4]], "array");

 $result = query($dbh, $sql);

-$result->filters({three_times => sub { $_[0] * 3}});

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

 $result->filter({key1 => 'three_times'});

 $rows = $result->fetch_hash_all;

 is_deeply($rows, [{key1 => 3, key2 => 2}, {key1 => 9, key2 => 4}], "hash");