Changeset 101

Timestamp:

05/04/06 00:08:12 (4 years ago)

Author:

sky

Message:

r104@crucially-3 (orig r1088): ykerherve | 2006-01-30 14:41:34 -0800
Fixed a nasty bug where the Driver modifies the $term passed in arguments for '-and'
so if you reused $terms twice, -and gets transformed to a -or

Location:

trunk

Files:

• lib/Data/ObjectDriver/SQL.pm (modified) (1 diff)
• t/11-sql.t (modified) (2 diffs)

trunk/lib/Data/ObjectDriver/SQL.pm

@@ -84 +84 @@
     if (ref($val) eq 'ARRAY') {
         my $logic = 'OR';
+        my @val = @$val;
         if ($val->[0] eq '-and') {
             $logic = 'AND';
-            shift @$val;
+            shift @val;
         }
         my @terms;
-        for my $val (@$val) {
+        for my $val (@val) {
             my($term, $bind) = $stmt->_mk_term($col, $val);
             push @terms, $term;

trunk/t/11-sql.t

@@ -4 +4 @@
 
 use Data::ObjectDriver::SQL;
-use Test::More tests => 49;
+use Test::More tests => 51;
 
 my $stmt = ns();
@@ -128 +128 @@
 is($stmt->bind->[2], 'baz');
 
+## regression bug. modified parameters
+my %terms = ( foo => [-and => 'foo', 'bar', 'baz']);
+$stmt = ns();
+$stmt->add_where(%terms);
+is($stmt->as_sql_where, "WHERE (foo = ? AND foo = ? AND foo = ?)\n");
+$stmt->add_where(%terms);
+is($stmt->as_sql_where, "WHERE (foo = ? AND foo = ? AND foo = ?) AND (foo = ? AND foo = ? AND foo = ?)\n");
+
 $stmt = ns();
 $stmt->add_select(foo => 'foo');