Doctrine

Timestamp:

12/04/09 19:12:51 (8 months ago)

Author:

kriswallsmith

Message:

[1.2] fixed misplaced paren when parsing join condition

Location:

branches/1.2

Files:

• lib/Doctrine/Query/JoinCondition.php (modified) (1 diff)
• tests/Ticket/1483TestCase.php (modified) (1 diff)

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

@@ -123 +123 @@
                     $rightExpr = (($hasRightAggExpression) ? $rightMatches[1] . '(' : '')
                               . $value
-                              . (($hasRightAggExpression) ? $rightMatches[3] . ')' : '') ;
+                              . (($hasRightAggExpression) ? ')' . $rightMatches[3] : '') ;
 
                     $condition  = $leftExpr . ' ' . $operator . ' ' . $rightExpr;

branches/1.2/tests/Ticket/1483TestCase.php

@@ -59 +59 @@
 
     }
+
+    public function testTest4()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1483_User u')
+            ->leftJoin('u.Groups g WITH g.id = (SELECT SUM(1, 2, 3) AS testing)');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1483__user t LEFT JOIN ticket_1483__user_group t3 ON (t.id = t3.user_id) LEFT JOIN ticket_1483__group t2 ON t2.id = t3.group_id AND (t2.id = (SELECT SUM(1, 2, 3) AS testing))');
+
+    }
 }