Merge branch 'gh621' into 1.0.x

* gh621: Fix querying for empty simple ref many Closes #1313.
doctrine · Dec 17, 2015 · 8876b91 · 8876b91
2 parents 1a2c2ef + 244ff35
commit 8876b91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php b/lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php
@@ -973,7 +973,7 @@ private function prepareQueryElement($fieldName, $value = null, $class = null, $
             }
 
             // No further preparation unless we're dealing with a simple reference
-            if (empty($mapping['reference']) || empty($mapping['simple'])) {
+            if (empty($mapping['reference']) || empty($mapping['simple']) || empty((array) $value)) {
                 return array($fieldName, $value);
             }
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/SimpleReferencesTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/SimpleReferencesTest.php
@@ -115,4 +115,15 @@ public function testQueryForNonIds() {
         $qb->field('user')->exists(true);
         $this->assertEquals(array('userId' => array('$exists' => true)), $qb->getQueryArray());
     }
+
+    public function testRemoveDocumentByEmptyRefMany()
+    {
+        $qb = $this->dm->createQueryBuilder('Documents\SimpleReferenceUser');
+        $qb->field('users')->equals(array());
+        $this->assertEquals(array('users' => array()), $qb->getQueryArray());
+
+        $qb = $this->dm->createQueryBuilder('Documents\SimpleReferenceUser');
+        $qb->field('users')->equals(new \stdClass());
+        $this->assertEquals(array('users' => new \stdClass()), $qb->getQueryArray());
+    }
 }