RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-29 19:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Proper FORM clause generation to support locking

Browse Source
This commit is contained in:
Juozas Kaziukenas 2010-11-16 16:12:08 -08:00
parent 494bfc8966
commit b6da2e0e42
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,8 +844,8 @@ class BasicEntityPersister
} }
return 'SELECT ' . $this->_getSelectColumnListSQL() return 'SELECT ' . $this->_getSelectColumnListSQL()
. ' FROM ' . $this->_class->getQuotedTableName($this->_platform) . ' ' . $this->_platform->appendLockHint(' FROM ' . $this->_class->getQuotedTableName($this->_platform) . ' '
. $this->_getSQLTableAlias($this->_class->name) . $this->_getSQLTableAlias($this->_class->name), $lockMode)
. $joinSql . $joinSql
. ($conditionSql ? ' WHERE ' . $conditionSql : '') . ($conditionSql ? ' WHERE ' . $conditionSql : '')
. $orderBySql . $orderBySql
@ -1082,7 +1082,7 @@ class BasicEntityPersister
} }
$sql = 'SELECT 1 ' $sql = 'SELECT 1 '
. $this->getLockTablesSql() . $this->_platform->appendLockHint($this->getLockTablesSql(), $lockMode)
. ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ' . $lockSql; . ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ' . $lockSql;
$params = array_values($criteria); $params = array_values($criteria);
$this->_conn->executeQuery($sql, $params); $this->_conn->executeQuery($sql, $params);