Changeset 4560

Timestamp:

06/25/08 18:58:06 (7 months ago)

Author:

guilhermeblanco

Message:

Fix for ( XXX ) in joins. Issue reported when using IN ( SUBSELECT ), but issue cound be reachable using SQL: and enum too.

Location:

branches/0.11

Files:

• lib/Doctrine/Query/JoinCondition.php (modified) (3 diffs)
• tests/Query/JoinTestCase.php (modified) (2 diffs)

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

@@ -79 +79 @@
             }
 
+            // FIX: Issues with "(" XXX ")"
+            if ($hasRightAggExpression) {
+                $value = '(' . $value . ')';
+            }
+
             if (substr($value, 0, 1) == '(') {
                 // trim brackets
@@ -86 +91 @@
                     // subquery found
                     $q = $this->query->createSubquery();
-                    $value = '(' . $q->parseQuery($trimmed)->getQuery() . ')';
+
+                    // Change due to bug "(" XXX ")"
+                    //$value = '(' . $q->parseQuery($trimmed)->getQuery() . ')';
+                    $value = $q->parseQuery($trimmed)->getQuery();
                 } elseif (substr($trimmed, 0, 4) == 'SQL:') {
-                    $value = '(' . substr($trimmed, 4) . ')';
+                    // Change due to bug "(" XXX ")"
+                    //$value = '(' . substr($trimmed, 4) . ')';
+                    $value = substr($trimmed, 4);
                 } else {
                     // simple in expression found
@@ -107 +117 @@
                         }
                     }
-                    $value = '(' . implode(', ', $value) . ')';
+
+                    // Change due to bug "(" XXX ")"
+                    //$value = '(' . implode(', ', $value) . ')';
+                    $value = implode(', ', $value);
                 }
             } else {

branches/0.11/tests/Query/JoinTestCase.php

@@ -95 +95 @@
               ->innerJoin('c.City c2 WITH (c2.name = ? OR c2.id IN (SELECT c3.id FROM Record_City c3 WHERE c3.id = ? OR c3.id = ?))');
             $sql = $q->getSql();
-            $this->assertEqual($sql, '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 (r2.name = ? OR c2.id IN (SELECT c3.id FROM Record_City c3 WHERE c3.id = ? OR c3.id = ?))');
+            $this->assertEqual($sql, '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 (r2.name = ? OR r2.id IN (SELECT r3.id AS r3__id FROM record__city r3 WHERE (r3.id = ? OR r3.id = ?)))');
+
             $this->pass();
         } catch (Exception $e) {
@@ -124 +125 @@
           ->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 r2.id IN (?,?) WHERE r.id = ?');
+        $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 r2.id IN (?, ?) WHERE r.id = ?');
     }