Doctrine

Timestamp:

06/08/08 15:50:10 (21 months ago)

Author:

guilhermeblanco

Message:

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

Files:

• branches/0.11/lib/Doctrine/Query/JoinCondition.php (modified) (2 diffs)

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;
     }