From 8a67621b6ae2d0388e506fc8406e15806ee19831 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 15 May 2010 09:58:39 +0200 Subject: [PATCH] DDC-178 - Fixed problems occuring from merging upstream, re-ran API and tests, finalizing lock-support for merge with upstream --- lib/Doctrine/ORM/OptimisticLockException.php | 9 +++++---- lib/Doctrine/ORM/UnitOfWork.php | 2 +- .../Tests/ORM/Functional/Locking/GearmanLockTest.php | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/Doctrine/ORM/OptimisticLockException.php b/lib/Doctrine/ORM/OptimisticLockException.php index eebb0150a..028698cd8 100644 --- a/lib/Doctrine/ORM/OptimisticLockException.php +++ b/lib/Doctrine/ORM/OptimisticLockException.php @@ -24,6 +24,7 @@ namespace Doctrine\ORM; * that uses optimistic locking through a version field fails. * * @author Roman Borschel + * @author Benjamin Eberlei * @since 2.0 */ class OptimisticLockException extends ORMException @@ -50,13 +51,13 @@ class OptimisticLockException extends ORMException return new self("The optimistic lock on an entity failed.", $entity); } - public static function lockFailedVersionMissmatch($expectedLockVersion, $actualLockVersion) + public static function lockFailedVersionMissmatch($entity, $expectedLockVersion, $actualLockVersion) { - return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion); + return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion, $entity); } - public static function notVersioned($className) + public static function notVersioned($entityName) { - return new self("Cannot obtain optimistic lock on unversioned entity ".$className); + return new self("Cannot obtain optimistic lock on unversioned entity " . $entityName, null); } } \ No newline at end of file diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index ef71d278c..2428098ef 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1654,7 +1654,7 @@ class UnitOfWork implements PropertyChangedListener if ($lockVersion != null) { $entityVersion = $class->reflFields[$class->versionField]->getValue($entity); if ($entityVersion != $lockVersion) { - throw OptimisticLockException::lockFailedVersionMissmatch($lockVersion, $entityVersion); + throw OptimisticLockException::lockFailedVersionMissmatch($entity, $lockVersion, $entityVersion); } } } else if ($lockMode == LockMode::PESSIMISTIC_READ || $lockMode == LockMode::PESSIMISTIC_WRITE) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index ced552422..0efca5c12 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -140,7 +140,7 @@ class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase protected function asyncFindWithLock($entityName, $entityId, $lockMode) { - $this->startGearmanJob('findWithLock', array( + $this->startJob('findWithLock', array( 'entityName' => $entityName, 'entityId' => $entityId, 'lockMode' => $lockMode, @@ -149,7 +149,7 @@ class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase protected function asyncDqlWithLock($dql, $params, $lockMode) { - $this->startGearmanJob('dqlWithLock', array( + $this->startJob('dqlWithLock', array( 'dql' => $dql, 'dqlParams' => $params, 'lockMode' => $lockMode, @@ -158,14 +158,14 @@ class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase protected function asyncLock($entityName, $entityId, $lockMode) { - $this->startGearmanJob('lock', array( + $this->startJob('lock', array( 'entityName' => $entityName, 'entityId' => $entityId, 'lockMode' => $lockMode, )); } - protected function startGearmanJob($fn, $fixture) + protected function startJob($fn, $fixture) { $this->gearman->addTask($fn, serialize(array( 'conn' => $this->_em->getConnection()->getParams(),