DDC-822 - Fix making queries with detached entities

Seldaek · Sep 30, 2010 · 638c3df · 638c3df
1 parent de236e0
commit 638c3df
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php
@@ -242,10 +242,14 @@ protected function _doExecute()
             }
 
             if (is_object($value) && $this->_em->getMetadataFactory()->hasMetadataFor(get_class($value))) {
-                //TODO: Check that $value is MANAGED?
-                $values = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
+                if ($this->_em->getUnitOfWork()->getEntityState($value) == UnitOfWork::STATE_MANAGED) {
+                    $idValues = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
+                } else {
+                    $class = $this->_em->getClassMetadata(get_class($value));
+                    $idValuess = $class->getIdentifierValues($value);
+                }
                 $sqlPositions = $paramMappings[$key];
-                $sqlParams += array_combine((array)$sqlPositions, $values);
+                $sqlParams += array_combine((array)$sqlPositions, $idValues);
             } else {
                 foreach ($paramMappings[$key] as $position) {
                     $sqlParams[$position] = $value;

diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php
@@ -105,8 +105,8 @@ public function testDetachedEntityThrowsExceptionOnFlush()
         } catch (\Exception $expected) {}
     }
 
-    public function testUninitializedLazyAssociationsAreIgnoredOnMerge() {
-        //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
+    public function testUninitializedLazyAssociationsAreIgnoredOnMerge()
+    {
         $user = new CmsUser;
         $user->name = 'Guilherme';
         $user->username = 'gblanco';
@@ -136,5 +136,30 @@ public function testUninitializedLazyAssociationsAreIgnoredOnMerge() {
         $this->assertFalse($managedAddress2->user === $detachedAddress2->user);
         $this->assertFalse($managedAddress2->user->__isInitialized__);
     }
+
+    /**
+     * @group DDC-822
+     */
+    public function testUseDetachedEntityAsQueryParameter()
+    {
+        $user = new CmsUser;
+        $user->name = 'Guilherme';
+        $user->username = 'gblanco';
+        $user->status = 'developer';
+
+        $this->_em->persist($user);
+
+        $this->_em->flush();
+        $this->_em->detach($user);
+
+        $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1";
+        $query = $this->_em->createQuery($dql);
+        $query->setParameter(1, $user);
+
+        $newUser = $query->getSingleResult();
+
+        $this->assertType('Doctrine\Tests\Models\CMS\CmsUser', $newUser);
+        $this->assertEquals('gblanco', $newUser->username);
+    }
 }