Merge pull request #330 from utopia-php/fetchall-single-row

fetchAll getDocument
utopia-php · Oct 13, 2023 · a37c8e7 · a37c8e7
2 parents e9fd6a9 + c404815
commit a37c8e7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Database/Adapter/MariaDB.php b/src/Database/Adapter/MariaDB.php
@@ -714,6 +714,7 @@ public function updateDocument(string $collection, Document $document): Document
         $permissionsStmt->bindValue(':_uid', $document->getId());
         $permissionsStmt->execute();
         $permissions = $permissionsStmt->fetchAll();
+        $permissionsStmt->closeCursor();
 
         $initial = [];
         foreach (Database::PERMISSIONS as $type) {
@@ -1098,6 +1099,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
         }
 
         $results = $stmt->fetchAll();
+        $stmt->closeCursor();
 
         foreach ($results as $index => $document) {
             if (\array_key_exists('_uid', $document)) {
@@ -1181,7 +1183,11 @@ public function count(string $collection, array $queries = [], ?int $max = null,
 
         $stmt->execute();
 
-        $result = $stmt->fetch();
+        $result = $stmt->fetchAll();
+        $stmt->closeCursor();
+        if (!empty($result)) {
+            $result = $result[0];
+        }
 
         return $result['sum'] ?? 0;
     }
@@ -1238,7 +1244,11 @@ public function sum(string $collection, string $attribute, array $queries = [],
 
         $stmt->execute();
 
-        $result = $stmt->fetch();
+        $result = $stmt->fetchAll();
+        $stmt->closeCursor();
+        if (!empty($result)) {
+            $result = $result[0];
+        }
 
         return $result['sum'] ?? 0;
     }

diff --git a/src/Database/Adapter/Postgres.php b/src/Database/Adapter/Postgres.php
@@ -723,6 +723,7 @@ public function updateDocument(string $collection, Document $document): Document
         $permissionsStmt->bindValue(':_uid', $document->getId());
         $permissionsStmt->execute();
         $permissions = $permissionsStmt->fetchAll();
+        $permissionsStmt->closeCursor();
 
         $initial = [];
         foreach (Database::PERMISSIONS as $type) {
@@ -1104,6 +1105,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
         }
 
         $results = $stmt->fetchAll();
+        $stmt->closeCursor();
 
         foreach ($results as $index => $document) {
             if (\array_key_exists('_uid', $document)) {

diff --git a/src/Database/Adapter/SQL.php b/src/Database/Adapter/SQL.php
@@ -81,7 +81,11 @@ public function exists(string $database, ?string $collection): bool
 
         $stmt->execute();
 
-        $document = $stmt->fetch();
+        $document = $stmt->fetchAll();
+        $stmt->closeCursor();
+        if (!empty($document)) {
+            $document = $document[0];
+        }
 
         return (($document[$select] ?? '') === $match) || // case insensitive check
             (($document[strtolower($select)] ?? '') === $match);
@@ -121,12 +125,15 @@ public function getDocument(string $collection, string $id, array $queries = [])
         $stmt->bindValue(':_uid', $id);
         $stmt->execute();
 
-        $document = $stmt->fetch();
+        $document = $stmt->fetchAll();
+        $stmt->closeCursor();
 
         if (empty($document)) {
             return new Document([]);
         }
 
+        $document = $document[0];
+
         if (\array_key_exists('_id', $document)) {
             $document['$internalId'] = $document['_id'];
             unset($document['_id']);

diff --git a/src/Database/Adapter/SQLite.php b/src/Database/Adapter/SQLite.php
@@ -53,7 +53,11 @@ public function exists(string $database, ?string $collection): bool
 
         $stmt->execute();
 
-        $document = $stmt->fetch();
+        $document = $stmt->fetchAll();
+        $stmt->closeCursor();
+        if (!empty($document)) {
+            $document = $document[0];
+        }
 
         return (($document['name'] ?? '') === "{$this->getNamespace()}_{$collection}");
     }
@@ -495,6 +499,7 @@ public function updateDocument(string $collection, Document $document): Document
         $permissionsStmt->bindValue(':_uid', $document->getId());
         $permissionsStmt->execute();
         $permissions = $permissionsStmt->fetchAll();
+        $permissionsStmt->closeCursor();
 
         $initial = [];
         foreach (Database::PERMISSIONS as $type) {