RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #886 from Strate/bugfix/join-with-condition-placement-fix

Browse source 
[DDC-1256] Fix applying ON/WITH conditions to first join in Class Table Inheritance
This commit is contained in:
Guilherme Blanco 2014-02-17 12:12:05 -05:00
commit 0dbd742588
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/Doctrine/ORM/Query/SqlWalker.php
View file

@ -894,6 +894,8 @@ class SqlWalker implements TreeWalker
} }
} }
$targetTableJoin = null;
// This condition is not checking ClassMetadata::MANY_TO_ONE, because by definition it cannot // This condition is not checking ClassMetadata::MANY_TO_ONE, because by definition it cannot
// be the owning side and previously we ensured that $assoc is always the owning side of the associations. // be the owning side and previously we ensured that $assoc is always the owning side of the associations.
// The owning side is necessary at this point because only it contains the JoinColumn information. // The owning side is necessary at this point because only it contains the JoinColumn information.
@ -928,7 +930,10 @@ class SqlWalker implements TreeWalker
$conditions[] = $filterExpr; $conditions[] = $filterExpr;
} }
$sql .= $targetTableName . ' ' . $targetTableAlias . ' ON ' . implode(' AND ', $conditions); $targetTableJoin = array(
'table' => $targetTableName . ' ' . $targetTableAlias,
'condition' => implode(' AND ', $conditions),
);
break; break;
case ($assoc['type'] == ClassMetadata::MANY_TO_MANY): case ($assoc['type'] == ClassMetadata::MANY_TO_MANY):
@ -980,20 +985,33 @@ class SqlWalker implements TreeWalker
$conditions[] = $filterExpr; $conditions[] = $filterExpr;
} }
$sql .= $targetTableName . ' ' . $targetTableAlias . ' ON ' . implode(' AND ', $conditions); $targetTableJoin = array(
'table' => $targetTableName . ' ' . $targetTableAlias,
'condition' => implode(' AND ', $conditions),
);
break; break;
default:
throw new \BadMethodCallException('Type of association must be one of *_TO_ONE or MANY_TO_MANY');
} }
// Handle WITH clause // Handle WITH clause
if ($condExpr !== null) { $withCondition = (null === $condExpr) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
// Phase 2 AST optimization: Skip processing of ConditionalExpression
// if only one ConditionalTerm is defined if ($targetClass->isInheritanceTypeJoined()) {
$sql .= ' AND (' . $this->walkConditionalExpression($condExpr) . ')'; $ctiJoins = $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
// If we have WITH condition, we need to build nested joins for target class table and cti joins
if ($withCondition) {
$sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
} else {
$sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
}
} else {
$sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
} }
// FIXME: these should either be nested or all forced to be left joins (DDC-XXX) if ($withCondition) {
if ($targetClass->isInheritanceTypeJoined()) { $sql .= ' AND ' . $withCondition;
$sql .= $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
} }
// Apply the indexes // Apply the indexes

2
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View file

@ -2065,7 +2065,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
{ {
$this->assertSqlGeneration( $this->assertSqlGeneration(
'SELECT e.id FROM Doctrine\Tests\Models\Company\CompanyOrganization o JOIN o.events e WITH e.id = ?1', 'SELECT e.id FROM Doctrine\Tests\Models\Company\CompanyOrganization o JOIN o.events e WITH e.id = ?1',
'SELECT c0_.id AS id0 FROM company_organizations c1_ INNER JOIN company_events c0_ ON c1_.id = c0_.org_id AND (c0_.id = ?) LEFT JOIN company_auctions c2_ ON c0_.id = c2_.id LEFT JOIN company_raffles c3_ ON c0_.id = c3_.id', 'SELECT c0_.id AS id0 FROM company_organizations c1_ INNER JOIN (company_events c0_ LEFT JOIN company_auctions c2_ ON c0_.id = c2_.id LEFT JOIN company_raffles c3_ ON c0_.id = c3_.id) ON c1_.id = c0_.org_id AND (c0_.id = ?)',
array(Query::HINT_FORCE_PARTIAL_LOAD => false) array(Query::HINT_FORCE_PARTIAL_LOAD => false)
); );
} }