RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1693] Fix fatal errors in DQL when using Optimistic or None lock modes. Added tests.

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-03-11 22:28:57 +01:00
parent f6a61b133e
commit 79d9c07652
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -440,13 +440,15 @@ class SqlWalker implements TreeWalker
$sql .= ' ' . $this->_platform->getWriteLockSQL(); $sql .= ' ' . $this->_platform->getWriteLockSQL();
break; break;
case LockMode::PESSIMISTIC_OPTIMISTIC: case LockMode::OPTIMISTIC:
foreach ($this->_selectedClasses AS $selectedClass) { foreach ($this->_selectedClasses AS $selectedClass) {
if ( ! $class->isVersioned) { if ( ! $selectedClass['class']->isVersioned) {
throw \Doctrine\ORM\OptimisticLockException::lockFailed($selectedClass['class']->name); throw \Doctrine\ORM\OptimisticLockException::lockFailed($selectedClass['class']->name);
} }
} }
break; break;
case LockMode::NONE:
break;
default: default:
throw \Doctrine\ORM\Query\QueryException::invalidLockMode(); throw \Doctrine\ORM\Query\QueryException::invalidLockMode();

19
tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
View File

@ -9,6 +9,9 @@ use Doctrine\Tests\Models\CMS\CmsArticle,
require_once __DIR__ . '/../../../TestInit.php'; require_once __DIR__ . '/../../../TestInit.php';
/**
* @group locking
*/
class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase { class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
protected function setUp() { protected function setUp() {
$this->useModelSet('cms'); $this->useModelSet('cms');
@ -139,7 +142,6 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
/** /**
* @group DDC-178 * @group DDC-178
* @group locking
*/ */
public function testLockPessimisticRead() { public function testLockPessimisticRead() {
$readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSql(); $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSql();
@ -166,4 +168,17 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
$query = array_pop( $this->_sqlLoggerStack->queries ); $query = array_pop( $this->_sqlLoggerStack->queries );
$this->assertContains($readLockSql, $query['sql']); $this->assertContains($readLockSql, $query['sql']);
} }
}
/**
* @group DDC-1693
*/
public function testLockOptimisticNonVersionedThrowsExceptionInDQL()
{
$dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'";
$this->setExpectedException('Doctrine\ORM\OptimisticLockException', 'The optimistic lock on an entity failed.');
$sql = $this->_em->createQuery($dql)->setHint(
\Doctrine\ORM\Query::HINT_LOCK_MODE, \Doctrine\DBAL\LockMode::OPTIMISTIC
)->getSQL();
}
}

14
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -908,6 +908,20 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
); );
} }
/**
* @group DDC-1693
* @group locking
*/
public function testLockModeNoneQueryHint()
{
$this->assertSqlGeneration(
"SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'",
"SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 ".
"FROM cms_users c0_ WHERE c0_.username = 'gblanco'",
array(Query::HINT_LOCK_MODE => \Doctrine\DBAL\LockMode::NONE)
);
}
/** /**
* @group DDC-430 * @group DDC-430
*/ */