RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 11:07:10 +03:00
Code Issues Projects Releases Wiki Activity

Fix applying ON/WITH conditions to first join in Class Table Inheritance

Browse Source
This commit is contained in:
Strate 2013-12-22 21:02:14 +04:00
parent 606ae2e03d
commit c6810861ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -982,6 +982,11 @@ class SqlWalker implements TreeWalker
break; break;
} }
// FIXME: these should either be nested or all forced to be left joins (DDC-XXX)
if ($targetClass->isInheritanceTypeJoined()) {
$sql .= $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
}
// Handle WITH clause // Handle WITH clause
if ($condExpr !== null) { if ($condExpr !== null) {
// Phase 2 AST optimization: Skip processing of ConditionalExpression // Phase 2 AST optimization: Skip processing of ConditionalExpression
@ -989,11 +994,6 @@ class SqlWalker implements TreeWalker
$sql .= ' AND (' . $this->walkConditionalExpression($condExpr) . ')'; $sql .= ' AND (' . $this->walkConditionalExpression($condExpr) . ')';
} }
// FIXME: these should either be nested or all forced to be left joins (DDC-XXX)
if ($targetClass->isInheritanceTypeJoined()) {
$sql .= $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
}
// Apply the indexes // Apply the indexes
if ($indexBy) { if ($indexBy) {
// For Many-To-One or One-To-One associations this obviously makes no sense, but is ignored silently. // For Many-To-One or One-To-One associations this obviously makes no sense, but is ignored silently.