Merge branch 'DDC-933'

lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php

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

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php

@@ -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();
+    }
+}