RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-15 07:36:03 +03:00
Code Issues Projects Releases Wiki Activity

DDC-551 - Fix some ugly yoda conditions and a wrong nesting.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-12-11 18:39:04 +01:00
parent 5e91f0c1ca
commit f7175c229e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

@ -903,7 +903,7 @@ class BasicEntityPersister
$alias = $this->_getSQLTableAlias($this->_class->name); $alias = $this->_getSQLTableAlias($this->_class->name);
if ('' !== $filterSql = $this->generateFilterConditionSQL($this->_class, $alias)) { if ($filterSql = $this->generateFilterConditionSQL($this->_class, $alias)) {
if ($conditionSql) { if ($conditionSql) {
$conditionSql .= ' AND '; $conditionSql .= ' AND ';
} }
@ -1025,11 +1025,11 @@ class BasicEntityPersister
$this->_selectJoinSql .= ' ' . $this->getJoinSQLForJoinColumns($assoc['joinColumns']); $this->_selectJoinSql .= ' ' . $this->getJoinSQLForJoinColumns($assoc['joinColumns']);
$this->_selectJoinSql .= ' ' . $eagerEntity->getQuotedTableName($this->_platform) . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON '; $this->_selectJoinSql .= ' ' . $eagerEntity->getQuotedTableName($this->_platform) . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON ';
$tableAlias = $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias);
foreach ($assoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) { foreach ($assoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) {
if ( ! $first) { if ( ! $first) {
$this->_selectJoinSql .= ' AND '; $this->_selectJoinSql .= ' AND ';
} }
$tableAlias = $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias);
$this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.' . $sourceCol . ' = ' $this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.' . $sourceCol . ' = '
. $tableAlias . '.' . $targetCol; . $tableAlias . '.' . $targetCol;
$first = false; $first = false;