Merge pull request #1636 from Nilz11/fix-dbref

Fixes dbref #1635
doctrine · Sep 28, 2017 · 64fa670 · 64fa670
2 parents d1fed2d + 7fce5d1
commit 64fa670
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -1413,7 +1413,7 @@ private function prepareDbRefElement($fieldName, $value, array $mapping, $inNewO
             return [[$fieldName, $dbRef]];
         }
         $keys = ['$ref' => true, '$id' => true, '$db' => true];
-        if ($mapping['storeAs'] === ClassMetadataInfo::REFERENCE_STORE_AS_ID) {
+        if ($mapping['storeAs'] !== ClassMetadataInfo::REFERENCE_STORE_AS_DB_REF_WITH_DB) {
             unset($keys['$db']);
         }
         if (isset($mapping['targetDocument'])) {

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/DocumentRepositoryTest.php b/tests/Doctrine/ODM/MongoDB/Tests/DocumentRepositoryTest.php
@@ -76,6 +76,28 @@ public function testFindByRefOneWithoutTargetDocumentFull()
         $this->assertSame($account, $this->dm->getRepository(Account::class)->findOneBy(['user' => $user]));
     }
 
+    public function testFindByRefOneWithoutTargetDocumentStoredAsDbRef()
+    {
+        $user = new User();
+        $account = new Account('name');
+        $account->setUserDbRef($user);
+        $this->dm->persist($user);
+        $this->dm->persist($account);
+        $this->dm->flush();
+
+        $query = $this->dm
+            ->getUnitOfWork()
+            ->getDocumentPersister(Account::class)
+            ->prepareQueryOrNewObj(['userDbRef' => $user]);
+        $expectedQuery = [
+            'userDbRef.$ref' => 'users',
+            'userDbRef.$id' => new \MongoId($user->getId())
+        ];
+        $this->assertEquals($expectedQuery, $query);
+
+        $this->assertSame($account, $this->dm->getRepository(Account::class)->findOneBy(['userDbRef' => $user]));
+    }
+
     public function testFindDiscriminatedByRefManyFull()
     {
         $project = new SubProject('mongodb-odm');

diff --git a/tests/Documents/Account.php b/tests/Documents/Account.php
@@ -16,6 +16,9 @@ class Account
     /** @ODM\ReferenceOne */
     protected $user;
 
+    /** @ODM\ReferenceOne(storeAs="dbRef") */
+    protected $userDbRef;
+
     public function getId()
     {
         return $this->id;
@@ -40,4 +43,14 @@ public function getUser()
     {
         return $this->user;
     }
+
+    public function setUserDbRef($userDbRef)
+    {
+        $this->userDbRef = $userDbRef;
+    }
+
+    public function getUserDbRef()
+    {
+        return $this->userDbRef;
+    }
 }