Doctrine

Timestamp:

06/08/08 19:50:10 (13 months ago)

Author:

guilhermeblanco

Message:

Fixed #1049. Updated wrong method name in ticket 930.

Location:

branches/0.11

Files:

• lib/Doctrine/Query/JoinCondition.php (modified) (2 diffs)
• tests/Query/JoinTestCase.php (modified) (1 diff)
• tests/Ticket/930TestCase.php (modified) (1 diff)

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

@@ -40 +40 @@
 
         if (count($e) > 2) {
+            $expr = new Doctrine_Expression($e[0], $this->query->getConnection());
+            $e[0] = $expr->getSql();
+
+            $operator  = $e[1];
+
+            $expr = new Doctrine_Expression($e[2], $this->query->getConnection());
+            $e[2] = $expr->getSql();
+
+            // We need to check for agg functions here
+            $hasLeftAggExpression = preg_match('/(.*)\(([^\)]*)\)([\)]*)/', $e[0], $leftMatches);
+
+            if ($hasLeftAggExpression) {
+                $e[0] = $leftMatches[2];
+            }
+
+            $hasRightAggExpression = preg_match('/(.*)\(([^\)]*)\)([\)]*)/', $e[2], $rightMatches);
+
+            if ($hasRightAggExpression) {
+                $e[2] = $rightMatches[2];
+            }
+
             $a         = explode('.', $e[0]);
             $field     = array_pop($a);
             $reference = implode('.', $a);
-            $operator  = $e[1];
             $value     = $e[2];
 
@@ -104 +124 @@
                     }
                 default:
-                    $condition  = $alias . '.' . $field . ' '
-                                . $operator . ' ' . $value;
+                    $leftExpr = (($hasLeftAggExpression) ? $leftMatches[1] . '(' : '') 
+                              . $alias . '.' . $field
+                              . (($hasLeftAggExpression) ? $leftMatches[3] . ')' : '') ;
+
+                    $rightExpr = (($hasRightAggExpression) ? $rightMatches[1] . '(' : '') 
+                              . $value
+                              . (($hasRightAggExpression) ? $rightMatches[3] . ')' : '') ;
+
+                    $condition  = $leftExpr . ' ' . $operator . ' ' . $rightExpr;
             }
 
         }
+
         return $condition;
     }

branches/0.11/tests/Query/JoinTestCase.php

@@ -88 +88 @@
 
 
+    public function testQueryMultipleAggFunctionInJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH LOWER(UPPER(c2.name)) LIKE LOWER(?)', array('city 1'))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSql(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND LOWER(r2.name) LIKE LOWER(?) WHERE r.id = ?');
+    }
+
+
     public function testQuerySupportsCustomJoinsAndWithKeyword()
     {

branches/0.11/tests/Ticket/930TestCase.php

@@ -88 +88 @@
       ->fetchArray();
     } catch (Exception $e) {
-      $this->fail($e->geMessage());
+      $this->fail($e->getMessage());
     }
     $this->assertEqual($queryCountBefore + 1, $this->conn->count());