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

DDC-546 - Fix some rebasing issues.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-01-02 12:54:55 +01:00
parent f572be92e2
commit 685e327b43
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -803,7 +803,7 @@ class BasicEntityPersister
} }
} }
$sql = $this->_getSelectEntitiesSQL($criteria, $assoc); $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, 0, $limit, $offset);
list($params, $types) = $this->expandParameters($criteria); list($params, $types) = $this->expandParameters($criteria);
return $this->_conn->executeQuery($sql, $params, $types); return $this->_conn->executeQuery($sql, $params, $types);
} }
@ -1273,30 +1273,9 @@ class BasicEntityPersister
} }
} }
<<<<<<< HEAD $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, 0, $limit, $offset);
$sql = $this->_getSelectEntitiesSQL($criteria, $assoc);
list($params, $types) = $this->expandParameters($criteria); list($params, $types) = $this->expandParameters($criteria);
$stmt = $this->_conn->executeQuery($sql, $params, $types); return $this->_conn->executeQuery($sql, $params, $types);
if ($coll) {
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$coll->hydrateAdd($this->_createEntity($result));
}
$stmt->closeCursor();
} else {
$entities = array();
while ($result = $stmt->fetch(PDO::FETCH_ASSOC)) {
$entities[] = $this->_createEntity($result);
}
$stmt->closeCursor();
return $entities;
}
=======
$sql = $this->_getSelectEntitiesSQL($criteria, $assoc, LockMode::NONE, $limit, $offset);
$params = array_values($criteria);
$stmt = $this->_conn->executeQuery($sql, $params);
return $stmt;
>>>>>>> Refactor DDC-546 persister approach.
} }
/** /**

2
tests/Doctrine/Tests/Mocks/EntityPersisterMock.php
View File

@ -59,7 +59,7 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\BasicEntityPersister
$this->_updates[] = $entity; $this->_updates[] = $entity;
} }
public function exists($entity) public function exists($entity, array $extraConditions = array())
{ {
$this->existsCalled = true; $this->existsCalled = true;
} }