Merge pull request #767 from doctrine/DDC-2627

Fixing missing table aliases when using Many2Many persister.
doctrine · Aug 22, 2013 · c399c77 · c399c77
2 parents 44f9952 + 09d51f9
commit c399c77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
@@ -235,7 +235,7 @@ public function count(PersistentCollection $coll)
         foreach ($joinColumns as $joinColumn) {
             $columnName     = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
             $referencedName = $joinColumn['referencedColumnName'];
-            $conditions[]   = $columnName . ' = ?';
+            $conditions[]   = 't.' . $columnName . ' = ?';
             $params[]       = ($class->containsForeignIdentifier)
                 ? $id[$class->getFieldForColumn($referencedName)]
                 : $id[$class->fieldNames[$referencedName]];
@@ -361,12 +361,13 @@ private function getJoinTableRestrictions(PersistentCollection $coll, $element,
         $params          = array();
 
         foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
-            $whereClauses[] = $joinTableColumn . ' = ?';
+            $whereClauses[] = ($addFilters ? 't.' : '') . $joinTableColumn . ' = ?';
 
             if (isset($mapping['relationToTargetKeyColumns'][$joinTableColumn])) {
                 $params[] = ($targetClass->containsForeignIdentifier)
                     ? $targetId[$targetClass->getFieldForColumn($mapping['relationToTargetKeyColumns'][$joinTableColumn])]
                     : $targetId[$targetClass->fieldNames[$mapping['relationToTargetKeyColumns'][$joinTableColumn]]];
+
                 continue;
             }
 
@@ -377,9 +378,12 @@ private function getJoinTableRestrictions(PersistentCollection $coll, $element,
         }
 
         if ($addFilters) {
+            $quotedJoinTable .= ' t';
+
             list($joinTargetEntitySQL, $filterSql) = $this->getFilterSql($filterMapping);
+
             if ($filterSql) {
-                $quotedJoinTable .= ' t ' . $joinTargetEntitySQL;
+                $quotedJoinTable .= ' ' . $joinTargetEntitySQL;
                 $whereClauses[] = $filterSql;
             }
         }

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1595Test.php
@@ -53,7 +53,7 @@ public function testIssue()
         $entities = $entity1->getEntities()->count();
 
         $this->assertEquals(
-            "SELECT COUNT(*) FROM entity1_entity2 t WHERE parent = ?",
+            "SELECT COUNT(*) FROM entity1_entity2 t WHERE t.parent = ?",
             $sqlLogger->queries[count($sqlLogger->queries)]['sql']
         );
     }