Partial update

phpunit.xml

@@ -7,7 +7,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
 >
     <testsuites>
         <testsuite name="unit">

src/Database/Adapter/MariaDB.php

@@ -977,9 +977,23 @@ public function updateDocument(Document $collection, string $id, Document $docum
             $spatialAttributes = $this->getSpatialAttributes($collection);
             $collection = $collection->getId();
             $attributes = $document->getAttributes();
-            $attributes['_createdAt'] = $document->getCreatedAt();
-            $attributes['_updatedAt'] = $document->getUpdatedAt();
-            $attributes['_permissions'] = json_encode($document->getPermissions());
+
+            if ($document->offsetExists('$updatedAt')) {
+                $attributes['_updatedAt'] = $document->getUpdatedAt();
+            }
+            if ($document->offsetExists('$createdAt')) {
+                $attributes['_createdAt'] = $document->getCreatedAt();
+            }
+            if ($document->offsetExists('$id')) {
+                $attributes['_uid'] = $document->getId();
+            }
+            if ($document->offsetExists('$permissions')) {
+                $attributes['_permissions'] = json_encode($document->getPermissions());
+            }
+
+            if (empty($attributes)) {
+                return $document;
+            }
 
             $name = $this->filter($collection);
             $columns = '';
@@ -998,7 +1012,8 @@ public function updateDocument(Document $collection, string $id, Document $docum
                  * Get current permissions from the database
                  */
                 $sqlPermissions = $this->getPDO()->prepare($sql);
-                $sqlPermissions->bindValue(':_uid', $document->getId());
+
+                $sqlPermissions->bindValue(':_uid', $id);
 
                 if ($this->sharedTables) {
                     $sqlPermissions->bindValue(':_tenant', $this->tenant);
@@ -1071,7 +1086,7 @@ public function updateDocument(Document $collection, string $id, Document $docum
                     $removeQuery = $this->trigger(Database::EVENT_PERMISSIONS_DELETE, $removeQuery);
 
                     $stmtRemovePermissions = $this->getPDO()->prepare($removeQuery);
-                    $stmtRemovePermissions->bindValue(':_uid', $document->getId());
+                    $stmtRemovePermissions->bindValue(':_uid', $id);
 
                     if ($this->sharedTables) {
                         $stmtRemovePermissions->bindValue(':_tenant', $this->tenant);
@@ -1119,7 +1134,8 @@ public function updateDocument(Document $collection, string $id, Document $docum
 
                     $stmtAddPermissions = $this->getPDO()->prepare($sql);
 
-                    $stmtAddPermissions->bindValue(":_uid", $document->getId());
+                    $newUid = $document->offsetExists('$id') ? $document->getId() : $id;
+                    $stmtAddPermissions->bindValue(":_uid", $newUid);
 
                     if ($this->sharedTables) {
                         $stmtAddPermissions->bindValue(":_tenant", $this->tenant);
@@ -1168,17 +1184,19 @@ public function updateDocument(Document $collection, string $id, Document $docum
 
             $sql = "
                 UPDATE {$this->getSQLTable($name)}
-                SET {$columns} _uid = :_newUid
+                SET " . \rtrim($columns, ',') . "
                 WHERE _id=:_sequence
                 {$this->getTenantQuery($collection)}
 			";
 
             $sql = $this->trigger(Database::EVENT_DOCUMENT_UPDATE, $sql);
 
+            var_dump('============================================');
+            var_dump($sql);
+
             $stmt = $this->getPDO()->prepare($sql);
 
             $stmt->bindValue(':_sequence', $document->getSequence());
-            $stmt->bindValue(':_newUid', $document->getId());
 
             if ($this->sharedTables) {
                 $stmt->bindValue(':_tenant', $this->tenant);

src/Database/Database.php

@@ -6137,8 +6137,10 @@ public function updateDocument(string $collection, string $id, Document $documen
         }
 
         $collection = $this->silent(fn () => $this->getCollection($collection));
+        $inputKeys = \array_keys($document->getArrayCopy());
         $newUpdatedAt = $document->getUpdatedAt();
-        $document = $this->withTransaction(function () use ($collection, $id, $document, $newUpdatedAt) {
+
+        $document = $this->withTransaction(function () use ($collection, $id, $document, $newUpdatedAt, $inputKeys) {
             $time = DateTime::now();
             $old = $this->authorization->skip(fn () => $this->silent(
                 fn () => $this->getDocument($collection->getId(), $id, forUpdate: true)
@@ -6158,6 +6160,8 @@ public function updateDocument(string $collection, string $id, Document $documen
 
                 $skipPermissionsUpdate = ($originalPermissions === $currentPermissions);
             }
+
+            var_dump($skipPermissionsUpdate);
             $createdAt = $document->getCreatedAt();
 
             $document = \array_merge($old->getArrayCopy(), $document->getArrayCopy());
@@ -6334,7 +6338,11 @@ public function updateDocument(string $collection, string $id, Document $documen
 
             $document = $this->adapter->castingBefore($collection, $document);
 
-            $this->adapter->updateDocument($collection, $id, $document, $skipPermissionsUpdate);
+            $adapterDocument = new Document(\array_intersect_key($document->getArrayCopy(), \array_flip($inputKeys)));
+            $adapterDocument->setAttribute('$sequence', $old->getSequence());
+            $adapterDocument->setAttribute('$updatedAt', $document->getUpdatedAt());
+
+            $this->adapter->updateDocument($collection, $id, $adapterDocument, $skipPermissionsUpdate);
 
             $document = $this->adapter->castingAfter($collection, $document);
 

tests/e2e/Adapter/Base.php

@@ -23,8 +23,8 @@
 
 abstract class Base extends TestCase
 {
-    use CollectionTests;
-    use CustomDocumentTypeTests;
+//    use CollectionTests;
+//    use CustomDocumentTypeTests;
     use DocumentTests;
     use AttributeTests;
     use IndexTests;

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -4645,7 +4645,45 @@ public function testEncodeDecode(): void
             new Document(['$id' => '3', 'label' => 'z']),
         ], $result->getAttribute('tags'));
     }
-    /**
+
+    public function testPartialUpdateDocument(): void
+    {
+        /** @var Database $database */
+        $database = $this->getDatabase();
+
+        $database->createCollection(__FUNCTION__);
+        $database->createAttribute(__FUNCTION__, 'string', Database::VAR_STRING, 128, true);
+
+        // Insert initial documents
+        $database->createDocument(__FUNCTION__, new Document([
+            '$id' => 'sam',
+            'string' => 'text📝 ' . $i,
+        ]));
+
+        var_dump('=======================================================================================');
+        var_dump('=======================================================================================');
+
+        /**
+         * test Update $id
+         */
+        $partial = new Document([
+            '$id'=> 'sam',
+        ]);
+
+        $partial = $this->getDatabase()->updateDocument($document->getCollection(), $document->getId(), $partial);
+        var_dump($partial);
+        $this->assertEquals('sam', $partial->getId());
+
+
+        $partial = $this->getDatabase()->getDocument($document->getCollection(), $partial->getId());
+        var_dump($partial);
+        $this->assertEquals('sam', $partial->getId());
+        $this->assertEquals('text📝', $partial->getAttribute('string'));
+
+        $this->assertEquals('shmuel', 'fogel');
+    }
+
+        /**
      * @depends testGetDocument
      */
     public function testUpdateDocument(Document $document): Document