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

#1277 DDC-3346 DDC-3531 - renaming persister context switch for clarity

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-23 16:01:48 +01:00
parent a37fa97be3
commit 1672448993
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -691,7 +691,7 @@ class BasicEntityPersister implements EntityPersister
*/
public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = null, $limit = null, array $orderBy = null)
{
$this->loadPersisterContext(null, $limit);
$this->switchPersisterContext(null, $limit);
$sql = $this->getSelectSQL($criteria, $assoc, $lockMode, $limit, null, $orderBy);
list($params, $types) = $this->expandParameters($criteria);
@ -863,7 +863,7 @@ class BasicEntityPersister implements EntityPersister
*/
public function loadAll(array $criteria = array(), array $orderBy = null, $limit = null, $offset = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$sql = $this->getSelectSQL($criteria, null, null, $limit, $offset, $orderBy);
list($params, $types) = $this->expandParameters($criteria);
@ -879,7 +879,7 @@ class BasicEntityPersister implements EntityPersister
*/
public function getManyToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$stmt = $this->getManyToManyStatement($assoc, $sourceEntity, $offset, $limit);
@ -954,7 +954,7 @@ class BasicEntityPersister implements EntityPersister
*/
private function getManyToManyStatement(array $assoc, $sourceEntity, $offset = null, $limit = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']);
$class = $sourceClass;
@ -1021,7 +1021,7 @@ class BasicEntityPersister implements EntityPersister
*/
public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit = null, $offset = null, array $orderBy = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$lockSql = '';
$joinSql = '';
@ -1686,7 +1686,7 @@ class BasicEntityPersister implements EntityPersister
*/
public function getOneToManyCollection(array $assoc, $sourceEntity, $offset = null, $limit = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$stmt = $this->getOneToManyStatement($assoc, $sourceEntity, $offset, $limit);
@ -1715,7 +1715,7 @@ class BasicEntityPersister implements EntityPersister
*/
private function getOneToManyStatement(array $assoc, $sourceEntity, $offset = null, $limit = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$criteria = array();
$parameters = array();
@ -1955,7 +1955,15 @@ class BasicEntityPersister implements EntityPersister
return $sql ? "(" . $sql . ")" : ""; // Wrap again to avoid "X or Y and FilterConditionSQL"
}
protected function loadPersisterContext($offset, $limit)
/**
* Switches persister context according to current query offset/limits
*
* This is due to the fact that to-many associations cannot be fetch-joined when a limit is involved
*
* @param null|int $offset
* @param null|int $limit
*/
protected function switchPersisterContext($offset, $limit)
{
if (null === $offset && null === $limit) {
$this->currentPersisterContext = $this->cachedPersisterContexts['noLimits'];

2
lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
View File

@ -299,7 +299,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
*/
public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit = null, $offset = null, array $orderBy = null)
{
$this->loadPersisterContext($offset, $limit);
$this->switchPersisterContext($offset, $limit);
$baseTableAlias = $this->getSQLTableAlias($this->class->name);
$joinSql = $this->getJoinSql($baseTableAlias);