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

 0.1644

-  added experimental build_where method

+  changed DBIx::Custom::Where greatly

 0.1633

   fixed test

 0.1632

@@ -686,7 +686,8 @@ sub update {

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

-sub where { DBIx::Custom::Where->new(sql_builder => shift->sql_builder) }

+sub where { DBIx::Custom::Where->new(

+              query_builder => shift->query_builder) }

 sub _build_binds {

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

@@ -10,88 +10,82 @@ use overload '""' => sub { shift->to_string }, fallback => 1;

 use Carp 'croak';

-__PACKAGE__->attr(clause => sub { [] });

-__PACKAGE__->attr(param => sub { {} });

-__PACKAGE__->attr(sql_builder => sub { {} });

+__PACKAGE__->attr(

+  'query_builder',

+  clause => sub { [] },

+  param => sub { {} }

+);

 sub to_string {

-    my ($self, $param, $clause) = @_;

-    

-    local $self->{_where}    = '';

-    local $self->{_count}    = {};

-    local $self->{_op_stack} = [];

-    local $self->{_param}    = $param;

+    my $self = shift;

+    my $clause = $self->clause;

     $clause = ['and', $clause] unless ref $clause eq 'ARRAY';

+    $clause->[0] = 'and' unless @$clause;

+

+    my $where = [];

+    my $count = {};

+    $self->_forward($clause, $where, $count, 'and');

+

+    unshift @$where, 'where' if @$where;

-    $self->_forward($clause);

-    

-    return $self->{_where};

+    return join(' ', @$where);

 }

-our %VALID_OPERATIONS = map { $_ => 1 } qw/and or or_repeat/;

+our %VALID_OPERATIONS = map { $_ => 1 } qw/and or/;

 sub _forward {

-    my ($self, $clause) = @_;

+    my ($self, $clause, $where, $count, $op) = @_;

     if (ref $clause eq 'ARRAY') {

-        $self->{_where} .= '( ';

+        push @$where, '(';

         my $op = $clause->[0] || '';

         croak qq{"$op" is invalid operation}

           unless $VALID_OPERATIONS{$op};

-        push @{$self->{_op_stack}}, $op;

-        

         for (my $i = 1; $i < @$clause; $i++) {

-            $self->_forword($clause->[$i]);

+            my $pushed = $self->_forward($clause->[$i], $where, $count, $op);

+            push @$where, $op if $pushed;

         }

-        pop @{$self->{_op_stack}};

-

-        if ($self->{_where} =~ /\( $/) {

-            $self->{_where} =~ s/\( $//;

-            $self->{_where} .= ' ';

+        pop @$where if $where->[-1] eq $op;

+        

+        if ($where->[-1] eq '(') {

+            pop @$where;

+            pop @$where;

+        }

+        else {

+            push @$where, ')';

         }

-        $self->{_where} =~ s/ $op $//;

-        $self->{_where} .= ' ) ';

     }

     else {

-        my $op = $self->{_op_stack}->[-1];

-        

-        my $columns = $self->sql_builder->build_query($clause)->columns;

+        # Column

+        my $columns = $self->query_builder->build_query($clause)->columns;

         croak qq{each tag contains one column name: tag "$clause"}

           unless @$columns == 1;

-        

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

-        my $ccount = ++$self->{_count}->{$column};

-        

-        my $param = $self->{_param};

+        # Count up

+        my $count = ++$count->{$column};

+        # Push element

+        my $param    = $self->param;

+        my $pushed;

         if (exists $param->{$column}) {

-            if ($op eq 'and' || $op eq 'or') {

-                if (ref $param->{$column} eq 'ARRAY') {

-                    $self->{_where} .= $clause . " $op "

-                      if exists $param->{$column}->[$ccount];

-                }

-                else {

-                    $self->{_where} .= $clause . " $op "

-                      if $ccount == 1;

-                }

+            if (ref $param->{$column} eq 'ARRAY') {

+                $pushed = 1 if exists $param->{$column}->[$count - 1];

             }

-            elsif ($op eq 'or_repeat') {

-                if (ref $param->{$column} eq 'ARRAY') {

-                    $self->{_where} .= $clause . " or "

-                      for (1 .. @{$param->{$column}});

-                }

-                else {

-                    $self->{_where} .= $clause;

-                }

+            elsif ($count == 1) {

+                $pushed = 1;

             }

         }

+        

+        push @$where, $clause if $pushed;

+        

+        return $pushed;

     }

 }

@@ -814,16 +814,15 @@ is(ref $query, 'DBIx::Custom::Query');

 $query = $dbi->select(table => 'table1', where => {key1 => 1, key2 => 2}, query => 1);

 is(ref $query, 'DBIx::Custom::Query');

-__END__

-

 test 'DBIx::Custom::Where';

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

 $dbi->execute($CREATE_TABLE->{0});

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

 $dbi->insert(table => 'table1', param => {key1 => 3, key2 => 4});

 $where = $dbi->where

-             ->clause(key1 => '{= key1}', key2 => '{= key2}')

+             ->clause(['and', '{= key1}', '{= key2}'])

              ->param({key1 => 1});

+

 $result = $dbi->select(

     table => 'table1',

     where => $where

@@ -832,7 +831,7 @@ $row = $result->fetch_hash_all;

 is_deeply($row, [{key1 => 1, key2 => 2}]);

 $where = $dbi->where

-             ->clause(key1 => '{= key1}', key2 => '{= key2}')

+             ->clause(['and', '{= key1}', '{= key2}'])

              ->param({key1 => 1, key2 => 2});

 $result = $dbi->select(

     table => 'table1',

@@ -842,7 +841,7 @@ $row = $result->fetch_hash_all;

 is_deeply($row, [{key1 => 1, key2 => 2}]);

 $where = $dbi->where

-             ->clause(key1 => '{= key1}', key2 => '{= key2}')

+             ->clause(['and', '{= key1}', '{= key2}'])

              ->param({});

 $result = $dbi->select(

     table => 'table1',

@@ -852,7 +851,7 @@ $row = $result->fetch_hash_all;

 is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

 $where = $dbi->where

-             ->clause(key1 => ['{> key1}', '{< key1}'], key2 => '{= key2}')

+             ->clause(['and', ['or', '{> key1}', '{< key1}'], '{= key2}'])

              ->param({key1 => [0, 3], key2 => 2});

 $result = $dbi->select(

     table => 'table1',

@@ -861,28 +860,6 @@ $result = $dbi->select(

 $row = $result->fetch_hash_all;

 is_deeply($row, [{key1 => 1, key2 => 2}]);

-$where = $dbi->where

-             ->clause(key1 => "{= key1}" )

-             ->or_clause(key2 => "{= key2}" )

-             ->param({ key1 => 1, key2 => [1, 2]});

-$result = $dbi->select(

-    table => 'table1',

-    where => $where,

-);

-$row = $result->fetch_hash_all;

-is_deeply($row, [{key1 => 1, key2 => 2}]);

-

-$where = $dbi->where

-             ->clause(key1 => "{= key1}" )

-             ->or_clause(key2 => "{= key2}" )

-             ->param({ key1 => 1, key2 => [2]});

-$result = $dbi->select(

-    table => 'table1',

-    where => $where

-);

-$row = $result->fetch_hash_all;

-is_deeply($row, [{key1 => 1, key2 => 2}]);

-

 $where = $dbi->where;

 $result = $dbi->select(

     table => 'table1',

@@ -891,6 +868,8 @@ $result = $dbi->select(

 $row = $result->fetch_hash_all;

 is_deeply($row, [{key1 => 1, key2 => 2}, {key1 => 3, key2 => 4}]);

+__END__

+

 eval {

 $where = $dbi->where

              ->clause(key1 => "{= key1}" )