Merge pull request #63 from utopia-php/fix-unique-index-exception-update-document

Throw correct error when updating documents with unique index

Author: eldadfux

src/Database/Adapter/MariaDB.php

@@ -375,7 +375,7 @@ public function createDocument(string $collection, Document $document): Document
                 case 1062:
                 case 23000:
                     $this->getPDO()->rollBack();
-                    throw new Duplicate('Duplicated document: '.$e->getMessage()); // TODO add test for catching this exception
+                    throw new Duplicate('Duplicated document: '.$e->getMessage());
                     break;
 
                 default:
@@ -434,7 +434,21 @@ public function updateDocument(string $collection, Document $document): Document
         }
 
         if(!empty($attributes)) {
-            $stmt->execute();
+            try {
+                $stmt->execute();
+            } catch (PDOException $e) {
+                switch ($e->getCode()) {
+                    case 1062:
+                    case 23000:
+                        $this->getPDO()->rollBack();
+                        throw new Duplicate('Duplicated document: '.$e->getMessage());
+                        break;
+
+                    default:
+                        throw $e;
+                        break;
+                }
+            }
         }
 
         if(!$this->getPDO()->commit()) {

src/Database/Adapter/MongoDB.php

@@ -376,11 +376,22 @@ public function updateDocument(string $collection, Document $document): Document
         $name = $this->filter($collection);
         $collection = $this->getDatabase()->$name;
 
-        $result = $collection->findOneAndUpdate(
-            ['_uid' => $document->getId()],
-            ['$set' => $this->replaceChars('$', '_', $document->getArrayCopy())],
-            ['returnDocument' => \MongoDB\Operation\FindOneAndUpdate::RETURN_DOCUMENT_AFTER]
-        );
+        try {
+            $result = $collection->findOneAndUpdate(
+                ['_uid' => $document->getId()],
+                ['$set' => $this->replaceChars('$', '_', $document->getArrayCopy())],
+                ['returnDocument' => \MongoDB\Operation\FindOneAndUpdate::RETURN_DOCUMENT_AFTER]
+            );
+        } catch (\MongoDB\Driver\Exception\CommandException $e) {
+            switch ($e->getCode()) {
+                case 11000:
+                    throw new Duplicate('Duplicated document: '.$e->getMessage());
+                    break;
+                default:
+                    throw $e;
+                    break;
+            }
+        }
 
         $result = $this->replaceChars('_', '$', $result);
 

tests/Database/Base.php

@@ -1567,4 +1567,26 @@ public function testUniqueIndexDuplicate()
             'generes' => ['animation', 'kids'],
         ]));
     }
+
+    /**
+     * @depends testUniqueIndexDuplicate
+     */
+    public function testUniqueIndexDuplicateUpdate()
+    {
+        // create document then update to conflict with index
+        $document = static::getDatabase()->createDocument('movies', new Document([
+            '$read' => ['role:all', 'user1', 'user2'],
+            '$write' => ['role:all', 'user1x', 'user2x'],
+            'name' => 'Frozen 5',
+            'director' => 'Chris Buck & Jennifer Lee',
+            'year' => 2013,
+            'price' => 39.50,
+            'active' => true,
+            'generes' => ['animation', 'kids'],
+        ]));
+
+        $this->expectException(DuplicateException::class);
+
+        static::getDatabase()->updateDocument('movies', $document->getId(), $document->setAttribute('name',  'Frozen'));
+    }
 }