Fix $set with new keys

xp-forge · Sep 22, 2024 · 7346a2f · 7346a2f
1 parent d6e4198
commit 7346a2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/test/php/web/session/mongo/unittest/CollectionV1.class.php b/src/test/php/web/session/mongo/unittest/CollectionV1.class.php
@@ -55,7 +55,8 @@ public function run($name, array $params= [], $method= 'write', Session $session
       case 'findAndModify':
 
         // Query will always be an ObjectId
-        $result= &$this->lookup[$params['query']['_id']->string()];
+        $oid= $params['query']['_id']->string();
+        $result= $this->lookup[$oid]->properties();
         switch (key($params['update'])) {
           case '$set': 
             foreach ($params['update']['$set'] as $name => $value) {
@@ -65,6 +66,7 @@ public function run($name, array $params= [], $method= 'write', Session $session
               }
               $ptr= $value;
             }
+            $this->lookup[$oid]= new Document($result);
             break;
 
           case '$unset': 
@@ -76,12 +78,13 @@ public function run($name, array $params= [], $method= 'write', Session $session
               }
               unset($ptr[$segments[$i]]);
             }
+            $this->lookup[$oid]= new Document($result);
             break;
         }
 
         return new Run(null, null, ['body' => [
           'lastErrorObject' => ['n' => 1, 'updatedExisting' => true],
-          'value'           => $result->properties()
+          'value'           => $result
         ]]);
 
       default:

diff --git a/src/test/php/web/session/mongo/unittest/CollectionV2.class.php b/src/test/php/web/session/mongo/unittest/CollectionV2.class.php
@@ -55,7 +55,8 @@ public function run($name, array $params= [], $method= 'write', Options... $opti
       case 'findAndModify':
 
         // Query will always be an ObjectId
-        $result= &$this->lookup[$params['query']['_id']->string()];
+        $oid= $params['query']['_id']->string();
+        $result= $this->lookup[$oid]->properties();
         switch (key($params['update'])) {
           case '$set': 
             foreach ($params['update']['$set'] as $name => $value) {
@@ -65,6 +66,7 @@ public function run($name, array $params= [], $method= 'write', Options... $opti
               }
               $ptr= $value;
             }
+            $this->lookup[$oid]= new Document($result);
             break;
 
           case '$unset': 
@@ -76,12 +78,13 @@ public function run($name, array $params= [], $method= 'write', Options... $opti
               }
               unset($ptr[$segments[$i]]);
             }
+            $this->lookup[$oid]= new Document($result);
             break;
         }
 
         return new Run(null, null, ['body' => [
           'lastErrorObject' => ['n' => 1, 'updatedExisting' => true],
-          'value'           => $result->properties()
+          'value'           => $result
         ]]);
 
       default: