RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-933 - Fix bug in lock sql generation of CTI classes.

Browse source
This commit is contained in:
Benjamin Eberlei 2010-12-14 23:26:40 +01:00
parent 2648c1a6ca
commit d87391e40c
2 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
View file

@ -365,6 +365,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
*/ */
public function getLockTablesSql() public function getLockTablesSql()
{ {
$idColumns = $this->_class->getIdentifierColumnNames();
$baseTableAlias = $this->_getSQLTableAlias($this->_class->name); $baseTableAlias = $this->_getSQLTableAlias($this->_class->name);
// INNER JOIN parent tables // INNER JOIN parent tables

37
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php Normal file
View file

@ -0,0 +1,37 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsGroup;
require_once __DIR__ . '/../../../TestInit.php';
class DDC933Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
public function setUp()
{
$this->useModelSet('company');
parent::setUp();
}
/**
* @group DDC-933
*/
public function testLockCTIClass()
{
$manager = new \Doctrine\Tests\Models\Company\CompanyManager();
$manager->setName('beberlei');
$manager->setSalary(1234);
$manager->setTitle('Vice Precident of This Test');
$manager->setDepartment("Foo");
$this->_em->persist($manager);
$this->_em->flush();
$this->_em->beginTransaction();
$this->_em->lock($manager, \Doctrine\DBAL\LockMode::PESSIMISTIC_READ);
$this->_em->rollback();
}
}