Merge pull request #47 from charsbar/fix/illegal_where_clauses

Fix illegal where clauses

Author: jamadam

lib/Data/ObjectDriver/SQL.pm

@@ -171,8 +171,10 @@ sub add_complex_where {
     my $stmt = shift;
     my ($terms) = @_;
     my ($where, $bind) = $stmt->_parse_array_terms($terms);
-    push @{ $stmt->{where} }, $where;
-    push @{ $stmt->{bind} }, @$bind;
+    if ($where) {
+        push @{ $stmt->{where} }, $where;
+        push @{ $stmt->{bind} }, @$bind;
+    }
 }
 
 sub _parse_array_terms {
@@ -195,18 +197,22 @@ sub _parse_array_terms {
             foreach my $t2 ( keys %$t ) {
                 my ($term, $bind, $col) = $stmt->_mk_term($t2, $t->{$t2});
                 $stmt->where_values->{$col} = $t->{$t2};
-                push @out, "($term)";
-                push @bind, @$bind;
+                if ($term) {
+                    push @out, "($term)";
+                    push @bind, @$bind;
+                }
             }
-            $out .= '(' . join(" AND ", @out) . ")";
+            $out .= '(' . join(" AND ", @out) . ")" if @out;
         }
         elsif (ref $t eq 'ARRAY') {
             # another array of terms to process!
             my ($where, $bind) = $stmt->_parse_array_terms( $t );
-            push @bind, @$bind;
-            $out = '(' . $where . ')';
+            if ($where) {
+                push @bind, @$bind;
+                $out = '(' . $where . ')';
+            }
         }
-        push @out, (@out ? ' ' . $logic . ' ' : '') . $out;
+        push @out, (@out ? ' ' . $logic . ' ' : '') . $out if $out;
     }
     return (join("", @out), \@bind);
 }

t/11-sql.t

@@ -3,7 +3,7 @@
 use strict;
 
 use Data::ObjectDriver::SQL;
-use Test::More tests => 103;
+use Test::More tests => 113;
 
 my $stmt = ns();
 ok($stmt, 'Created SQL object');
@@ -223,6 +223,31 @@ $stmt->add_where(foo => []);
 is($stmt->as_sql_where, "WHERE (0 = 1)\n"); # foo IN ()
 is(scalar @{ $stmt->bind }, 0);
 
+$stmt = ns();
+$stmt->add_complex_where([]);
+is($stmt->as_sql_where, "");  # no WHERE without expression
+is(scalar @{ $stmt->bind }, 0);
+
+$stmt = ns();
+$stmt->add_complex_where([[]]);
+is($stmt->as_sql_where, "");  # no WHERE without expression
+is(scalar @{ $stmt->bind }, 0);
+
+$stmt = ns();
+$stmt->add_complex_where([{}]);
+is($stmt->as_sql_where, "");  # no WHERE without expression
+is(scalar @{ $stmt->bind }, 0);
+
+$stmt = ns();
+$stmt->add_complex_where([{id => 1}, {}]);
+is($stmt->as_sql_where, "WHERE ((id = ?))\n");  # no empty expression
+is(scalar @{ $stmt->bind }, 1);
+
+$stmt = ns();
+$stmt->add_complex_where([{id => 1}, []]);
+is($stmt->as_sql_where, "WHERE ((id = ?))\n");  # no empty expression
+is(scalar @{ $stmt->bind }, 1);
+
 ## regression bug. modified parameters
 my %terms = ( foo => [-and => 'foo', 'bar', 'baz']);
 $stmt = ns();