Merge pull request #2205 from malarzm/prepare-expressions

Stop type conversion for certain keys in query

Author: malarzm

lib/Doctrine/ODM/MongoDB/Persisters/DocumentPersister.php

@@ -1031,6 +1031,10 @@ private function convertToDatabaseValue(string $fieldName, $value)
     {
         if (is_array($value)) {
             foreach ($value as $k => $v) {
+                if ($k === '$exists' || $k === '$type' || $k === '$currentDate') {
+                    continue;
+                }
+
                 $value[$k] = $this->convertToDatabaseValue($fieldName, $v);
             }
 

tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php

@@ -13,6 +13,7 @@
 use Doctrine\ODM\MongoDB\Tests\BaseTest;
 use Doctrine\ODM\MongoDB\Types\ClosureToPHP;
 use Doctrine\ODM\MongoDB\Types\Type;
+use Documents\Article;
 use Generator;
 use InvalidArgumentException;
 use MongoDB\BSON\ObjectId;
@@ -140,6 +141,33 @@ public function getTestPrepareFieldNameData()
         ];
     }
 
+    public function testCurrentDateInQuery()
+    {
+        $qb = $this->dm->createQueryBuilder(Article::class)
+            ->updateMany()
+            ->field('createdAt')->currentDate();
+
+        $this->assertSame(
+            ['$currentDate' => ['createdAt' => ['$type' => 'date']]],
+            $qb->getQuery()->debug('newObj')
+        );
+    }
+
+    public function testExistsInQuery()
+    {
+        $qb = $this->dm->createQueryBuilder(Article::class)
+            ->field('title')->exists(false)
+            ->field('createdAt')->exists(true);
+
+        $this->assertSame(
+            [
+                'title' => ['$exists' => false],
+                'createdAt' => ['$exists' => true],
+            ],
+            $qb->getQuery()->debug('query')
+        );
+    }
+
     /**
      * @dataProvider provideHashIdentifiers
      */