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

Added an exception when invalid case.

Browse Source 
Fixes after code review.
This commit is contained in:
Strate 2014-01-20 20:06:53 +04:00
parent 41ec5fd56d
commit 04e6061584
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,24 +991,28 @@ class SqlWalker implements TreeWalker
'condition' => implode(' AND ', $conditions), '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
$withCondition = (null !== $condExpr) ? ('(' . $this->walkConditionalExpression($condExpr) . ')') : ''; $withCondition = (null === $condExpr) ? '' : ('(' . $this->walkConditionalExpression($condExpr) . ')');
if ($targetClass->isInheritanceTypeJoined()) { if ($targetClass->isInheritanceTypeJoined()) {
$ctiJoins = $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias); $ctiJoins = $this->_generateClassTableInheritanceJoins($targetClass, $joinedDqlAlias);
// If we have WITH condition, we need to build nested joins for target class table and cti joins // If we have WITH condition, we need to build nested joins for target class table and cti joins
if ($withCondition) { if ($withCondition) {
$sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'] . ' AND ' . $withCondition; $sql .= '(' . $targetTableJoin['table'] . $ctiJoins . ') ON ' . $targetTableJoin['condition'];
} else { } else {
$sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins; $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'] . $ctiJoins;
} }
} else { } else {
$sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition']; $sql .= $targetTableJoin['table'] . ' ON ' . $targetTableJoin['condition'];
if ($withCondition) { }
$sql .= ' AND ' . $withCondition;
} if ($withCondition) {
$sql .= ' AND ' . $withCondition;
} }
// Apply the indexes // Apply the indexes