Doctrine

Timestamp:

10/15/08 19:59:45 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1558 - issue with empty whereIn params

Location:

branches

Files:

• 1.0/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.0/tests/run.php (modified) (1 diff)
• 1.0/tests/Ticket/1558TestCase.php (added)
• 1.1/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.1/tests/run.php (modified) (1 diff)
• 1.1/tests/Ticket/1558TestCase.php (added)

branches/1.0/lib/Doctrine/Query/Abstract.php

@@ -1286 +1286 @@
     public function andWhereIn($expr, $params = array(), $not = false)
     {
+        // if there's no params, return (else we'll get a WHERE IN (), invalid SQL)
+        if ( ! count($params)) {
+            return $this;
+        }
+
         if ($this->_hasDqlQueryPart('where')) {
             $this->_addDqlQueryPart('where', 'AND', true);
@@ -1304 +1309 @@
     public function orWhereIn($expr, $params = array(), $not = false)
     {
+        // if there's no params, return (else we'll get a WHERE IN (), invalid SQL)
+        if ( ! count($params)) {
+            return $this;
+        }
+
         if ($this->_hasDqlQueryPart('where')) {
             $this->_addDqlQueryPart('where', 'OR', true);

branches/1.0/tests/run.php

@@ -156 +156 @@
 $tickets->addTestCase(new Doctrine_Ticket_1543_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1545_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1558_TestCase());
 $test->addTestCase($tickets);
 

branches/1.1/lib/Doctrine/Query/Abstract.php

@@ -1385 +1385 @@
     public function andWhereIn($expr, $params = array(), $not = false)
     {
+        // if there's no params, return (else we'll get a WHERE IN (), invalid SQL)
+        if ( ! count($params)) {
+            return $this;
+        }
+
         if ($this->_hasDqlQueryPart('where')) {
             $this->_addDqlQueryPart('where', 'AND', true);
@@ -1403 +1408 @@
     public function orWhereIn($expr, $params = array(), $not = false)
     {
+        // if there's no params, return (else we'll get a WHERE IN (), invalid SQL)
+        if ( ! count($params)) {
+            return $this;
+        }
+
         if ($this->_hasDqlQueryPart('where')) {
             $this->_addDqlQueryPart('where', 'OR', true);

branches/1.1/tests/run.php

@@ -169 +169 @@
 $tickets->addTestCase(new Doctrine_Ticket_1543_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1545_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1558_TestCase());
 $test->addTestCase($tickets);