Doctrine

Timestamp:

08/19/08 00:14:01 (11 months ago)

Author:

guilhermeblanco

Message:

fixed #1329. Added checking for 2 words operator (NOT IN for example) in JoinCondition?.php

Location:

branches/1.0

Files:

• lib/Doctrine/Query/JoinCondition.php (modified) (1 diff)
• tests/Query/JoinConditionTestCase.php (modified) (2 diffs)
• tests/run.php (modified) (1 diff)

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

@@ -39 +39 @@
         $e = $this->_tokenizer->sqlExplode($condition);
 
-        if (count($e) > 2) {
+        if (($l = count($e)) > 2) {
             $expr = new Doctrine_Expression($e[0], $this->query->getConnection());
             $e[0] = $expr->getSql();
 
             $operator  = $e[1];
+
+            // FIX: "field NOT IN (XXX)" issue
+            // Related to ticket #1329
+            if ($l > 3) {
+                $operator .= ' ' . $e[2]; // Glue "NOT" and "IN"
+                $e[2] = $e[3]; // Move "(XXX)" to previous index
+
+                unset($e[3]); // Remove unused index
+            }
 
             if (substr(trim($e[2]), 0, 1) != '(') {

branches/1.0/tests/Query/JoinConditionTestCase.php

@@ -35 +35 @@
     public function prepareData() 
     { }
-    
+
     public function prepareTables() 
     { }
 
-    public function testJoinConditionsAreSupportedForOneToManyLeftJoins()
+    /*public function testJoinConditionsAreSupportedForOneToManyLeftJoins()
     {
         $q = new Doctrine_Query();
@@ -82 +82 @@
 
         $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.name = p.phonenumber WHERE (e.type = 0)");
+    }*/
+    
+    public function testJoinWithConditionAndNotInClause()
+    {
+        // Related to ticket #1329
+        $q = new Doctrine_Query();
+
+        $q->parseQuery("SELECT a.name, b.id FROM User a LEFT JOIN a.Phonenumber b WITH a.id NOT IN (1, 2, 3)");
+
+        $this->assertEqual($q->getQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id AND e.id NOT IN (1, 2, 3) WHERE (e.type = 0)");
     }
 }

branches/1.0/tests/run.php

@@ -119 +119 @@
 $tickets->addTestCase(new Doctrine_Ticket_1304_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1305_TestCase());
-
 $test->addTestCase($tickets);