Merge pull request #514 from utopia-php/feat-batch-upsert

Remove redundant method
utopia-php · Jan 23, 2025 · bd6f080 · bd6f080
2 parents 6ec27ad + 938e699
commit bd6f080
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 119 deletions.
diff --git a/src/Database/Adapter.php b/src/Database/Adapter.php
@@ -640,19 +640,17 @@ abstract public function updateDocuments(string $collection, Document $updates,
     /**
      * Create documents if they do not exist, otherwise update them.
      *
-     * If both attribute and value are not empty, only the specified attribute will be increased, by the provided value.
+     * If attribute is not empty, only the specified attribute will be increased, by the new value in each document.
      *
      * @param string $collection
      * @param string $attribute
-     * @param int|float $value
      * @param array<Document> $documents
      * @param int $batchSize
      * @return array<Document>
      */
     abstract public function createOrUpdateDocuments(
         string $collection,
         string $attribute,
-        int|float $value,
         array $documents,
         int $batchSize
     ): array;

diff --git a/src/Database/Adapter/MariaDB.php b/src/Database/Adapter/MariaDB.php
@@ -1594,7 +1594,6 @@ public function updateDocuments(string $collection, Document $updates, array $do
     /**
      * @param string $collection
      * @param string $attribute
-     * @param int|float $value
      * @param array<Document> $documents
      * @param int $batchSize
      * @return array<Document>
@@ -1603,7 +1602,6 @@ public function updateDocuments(string $collection, Document $updates, array $do
     public function createOrUpdateDocuments(
         string $collection,
         string $attribute,
-        int|float $value,
         array $documents,
         int $batchSize
     ): array {
@@ -1664,12 +1662,7 @@ public function createOrUpdateDocuments(
                     $batchKeys[] = '(' . \implode(', ', $bindKeys) . ')';
                 }
 
-                if (!empty($attribute) && !empty($value)) {
-                    // Increment specific column by the specified value
-                    $updateColumns = [
-                        "`{$attribute}` = `{$attribute}` + :_increment"
-                    ];
-                } elseif (!empty($attribute) && empty($value)) {
+                if (!empty($attribute)) {
                     // Increment specific column by its new value in place
                     $updateColumns = [
                         "`{$attribute}` = `{$attribute}` + VALUES(`{$attribute}`)"
@@ -1694,10 +1687,6 @@ public function createOrUpdateDocuments(
                     $stmt->bindValue($key, $binding, $this->getPDOType($binding));
                 }
 
-                if (!empty($attribute) && !empty($value)) {
-                    $stmt->bindValue(':_increment', $value, $this->getPDOType($value));
-                }
-
                 $stmt->execute();
 
                 // Fetch existing permissions in bulk after data updates

diff --git a/src/Database/Adapter/Mongo.php b/src/Database/Adapter/Mongo.php
@@ -894,12 +894,11 @@ public function updateDocuments(string $collection, Document $updates, array $do
     /**
      * @param string $collection
      * @param string $attribute
-     * @param float|int $value
      * @param array<Document> $documents
      * @param int $batchSize
      * @return array<Document>
      */
-    public function createOrUpdateDocuments(string $collection, string $attribute, float|int $value, array $documents, int $batchSize): array
+    public function createOrUpdateDocuments(string $collection, string $attribute, array $documents, int $batchSize): array
     {
         return $documents;
     }

diff --git a/src/Database/Adapter/Postgres.php b/src/Database/Adapter/Postgres.php
@@ -1608,12 +1608,11 @@ public function updateDocuments(string $collection, Document $updates, array $do
     /**
      * @param string $collection
      * @param string $attribute
-     * @param float|int $value
      * @param array<Document> $documents
      * @param int $batchSize
      * @return array<Document>
      */
-    public function createOrUpdateDocuments(string $collection, string $attribute, float|int $value, array $documents, int $batchSize): array
+    public function createOrUpdateDocuments(string $collection, string $attribute, array $documents, int $batchSize): array
     {
         return $documents;
     }

diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -425,7 +425,7 @@ function (mixed $value) {
                     $value = new \DateTime($value);
                     $value->setTimezone(new \DateTimeZone(date_default_timezone_get()));
                     return DateTime::format($value);
-                } catch (\Throwable $th) {
+                } catch (\Throwable) {
                     return $value;
                 }
             },
@@ -4536,7 +4536,7 @@ private function getJunctionCollection(Document $collection, Document $relatedCo
     }
 
     /**
-     * Create or update documents
+     * Create or update documents.
      *
      * @param string $collection
      * @param array<Document> $documents
@@ -4552,14 +4552,13 @@ public function createOrUpdateDocuments(
         return $this->createOrUpdateDocumentsWithIncrease(
             $collection,
             '',
-            0,
             $documents,
             $batchSize
         );
     }
 
     /**
-     * Create or update documents
+     * Create or update documents, increasing the value of the given attribute by the value in each document.
      *
      * @param string $collection
      * @param string $attribute
@@ -4568,37 +4567,11 @@ public function createOrUpdateDocuments(
      * @return array<Document>
      * @throws StructureException
      * @throws \Throwable
-     */
-    public function createOrUpdateDocumentsWithInplaceIncrease(
-        string $collection,
-        string $attribute,
-        array $documents,
-        int $batchSize = self::INSERT_BATCH_SIZE
-    ): array {
-        return $this->createOrUpdateDocumentsWithIncrease(
-            $collection,
-            $attribute,
-            0,
-            $documents,
-            $batchSize
-        );
-    }
-
-    /**
-     * @param string $collection
-     * @param string $attribute
-     * @param int|float $value
-     * @param array<Document> $documents
-     * @param int $batchSize
-     * @return array<Document>
-     * @throws StructureException
-     * @throws \Throwable
      * @throws Exception
      */
     public function createOrUpdateDocumentsWithIncrease(
         string $collection,
         string $attribute,
-        int|float $value,
         array $documents,
         int $batchSize = self::INSERT_BATCH_SIZE
     ): array {
@@ -4652,11 +4625,10 @@ public function createOrUpdateDocumentsWithIncrease(
             $documents[$key] = $document;
         }
 
-        $documents = $this->withTransaction(function () use ($collection, $attribute, $value, $documents, $batchSize) {
+        $documents = $this->withTransaction(function () use ($collection, $attribute, $documents, $batchSize) {
             return $this->adapter->createOrUpdateDocuments(
                 $collection->getId(),
                 $attribute,
-                $value,
                 $documents,
                 $batchSize,
             );

diff --git a/tests/e2e/Adapter/Base.php b/tests/e2e/Adapter/Base.php
@@ -2341,73 +2341,6 @@ public function testCreateOrUpdateDocumentsWithIncrease(): void
             return;
         }
 
-        $collection = 'testCreateOrUpdateWithIncrease';
-
-        static::getDatabase()->createCollection($collection);
-        static::getDatabase()->createAttribute($collection, 'string', Database::VAR_STRING, 128, true);
-        static::getDatabase()->createAttribute($collection, 'integer', Database::VAR_INTEGER, 0, true);
-
-        $documents = [
-            new Document([
-                '$id' => 'first',
-                'string' => 'text📝',
-                'integer' => 5,
-                '$permissions' => [
-                    Permission::read(Role::any()),
-                    Permission::create(Role::any()),
-                    Permission::update(Role::any()),
-                    Permission::delete(Role::any()),
-                ],
-            ]),
-            new Document([
-                '$id' => 'second',
-                'string' => 'text📝',
-                'integer' => 5,
-                '$permissions' => [
-                    Permission::read(Role::any()),
-                    Permission::create(Role::any()),
-                    Permission::update(Role::any()),
-                    Permission::delete(Role::any()),
-                ],
-            ]),
-        ];
-
-        static::getDatabase()->createDocuments($collection, $documents);
-
-        static::getDatabase()->createOrUpdateDocumentsWithIncrease(
-            collection: $collection,
-            attribute:'integer',
-            value: 1,
-            documents: $documents
-        );
-
-        $documents = static::getDatabase()->find($collection);
-
-        foreach ($documents as $document) {
-            $this->assertEquals(6, $document->getAttribute('integer'));
-        }
-
-        static::getDatabase()->createOrUpdateDocumentsWithIncrease(
-            collection: $collection,
-            attribute:'integer',
-            value: -1,
-            documents: $documents
-        );
-
-        $documents = static::getDatabase()->find($collection);
-
-        foreach ($documents as $document) {
-            $this->assertEquals(5, $document->getAttribute('integer'));
-        }
-    }
-
-    public function testCreateOrUpdateDocumentsWithInplaceIncrease(): void
-    {
-        if (!static::getDatabase()->getAdapter()->getSupportForUpserts()) {
-            $this->expectNotToPerformAssertions();
-            return;
-        }
-
         $collection = 'testCreateOrUpdateInplace';
 
         static::getDatabase()->createCollection($collection);
@@ -2444,7 +2377,7 @@ public function testCreateOrUpdateDocumentsWithInplaceIncrease(): void
         $documents[0]->setAttribute('integer', 1);
         $documents[1]->setAttribute('integer', 1);
 
-        static::getDatabase()->createOrUpdateDocumentsWithInplaceIncrease(
+        static::getDatabase()->createOrUpdateDocumentsWithIncrease(
             collection: $collection,
             attribute:'integer',
             documents: $documents