pg adapter

* added settimeouts for DML, selects
* added index attributes  types in create index
* added way of manually and automatic internal id in the create document

Author: ArnabChatterjee20k

src/Database/Adapter/Postgres.php

@@ -84,23 +84,32 @@ public function rollbackTransaction(): bool
         return $result;
     }
 
-    private function execute(\PDOStatement $stmt): bool
+    private function execute(mixed $stmt): bool
     {
+        $pdo = $this->getPDO();
         try {
+            if ($this->inTransaction === 0) {
+                $pdo->exec("SET statement_timeout = '{$this->timeout}ms'");
+            } else {
+                $pdo->exec("SET LOCAL statement_timeout = '{$this->timeout}'");
+            }
+
             $result = $stmt?->execute();
-        } catch (PDOException $e) {
+            return $result;
+
+        } catch (\PDOException $e) {
             throw $e;
         } finally {
-            try {
-                $this->getPDO()->prepare('SET statement_timeout = 0')->execute();
-            } catch (PDOException $e) {
-                throw $e;
+            if ($this->inTransaction === 0) {
+                $pdo->exec("RESET statement_timeout");
             }
         }
 
-        return $result;
+
     }
 
+
+
     /**
      * Returns Max Execution Time
      * @param int $milliseconds
@@ -118,8 +127,6 @@ public function setTimeout(int $milliseconds, string $event = Database::EVENT_AL
         }
 
         $this->timeout = $milliseconds;
-        $this->getPDO()->exec("ALTER SYSTEM SET statement_timeout = '{$milliseconds}'");
-        $this->getPDO()->exec("SELECT pg_reload_conf()");
     }
 
     /**
@@ -141,8 +148,9 @@ public function create(string $name): bool
         $sql = "CREATE SCHEMA \"{$name}\"";
         $sql = $this->trigger(Database::EVENT_DATABASE_CREATE, $sql);
 
-        $dbCreation = $this->execute($this->getPDO()
-            ->prepare($sql));
+        $dbCreation = $this->getPDO()
+        ->prepare($sql)
+        ->execute();
 
         $collation = "
             CREATE COLLATION IF NOT EXISTS utf8_ci (
@@ -151,7 +159,7 @@ public function create(string $name): bool
             deterministic = false
             );
         ";
-        $this->execute($this->getPDO()->prepare($collation));
+        $this->getPDO()->prepare($collation)->execute();
         return $dbCreation;
     }
 
@@ -170,8 +178,7 @@ public function delete(string $name): bool
         $sql = "DROP SCHEMA IF EXISTS \"{$name}\" CASCADE";
         $sql = $this->trigger(Database::EVENT_DATABASE_DELETE, $sql);
 
-        return $this->execute($this->getPDO()
-            ->prepare($sql));
+        return $this->getPDO()->prepare($sql)->execute();
     }
 
     /**
@@ -284,11 +291,9 @@ public function createCollection(string $name, array $attributes = [], array $in
         $permissions = $this->trigger(Database::EVENT_COLLECTION_CREATE, $permissions);
 
         try {
-            $this->execute($this->getPDO()
-                ->prepare($collection));
+            $this->getPDO()->prepare($collection)->execute();
 
-            $this->execute($this->getPDO()
-            ->prepare($permissions));
+            $this->getPDO()->prepare($permissions)->execute();
 
             foreach ($indexes as $index) {
                 $indexId = $this->filter($index->getId());
@@ -409,8 +414,7 @@ public function deleteCollection(string $id): bool
         $sql = "DROP TABLE {$this->getSQLTable($id)}, {$this->getSQLTable($id . '_perms')}";
         $sql = $this->trigger(Database::EVENT_COLLECTION_DELETE, $sql);
 
-        return $this->execute($this->getPDO()
-            ->prepare($sql));
+        return $this->getPDO()->prepare($sql)->execute();
     }
 
     /**
@@ -846,7 +850,7 @@ public function createIndex(string $collection, string $id, string $type, array
             };
 
             if (Database::INDEX_UNIQUE === $type) {
-                if ($indexAttributeTypes[$attr] === Database::VAR_STRING) {
+                if (isset($indexAttributeTypes[$attr]) && $indexAttributeTypes[$attr] === Database::VAR_STRING) {
                     $attributes[$i] = "\"{$attr}\" COLLATE utf8_ci {$order}";
                 } else {
                     $attributes[$i] = "\"{$attr}\" {$order}";
@@ -876,8 +880,7 @@ public function createIndex(string $collection, string $id, string $type, array
         $sql = $this->trigger(Database::EVENT_INDEX_CREATE, $sql);
 
         try {
-            return $this->execute($this->getPDO()
-                ->prepare($sql));
+            return $this->getPDO()->prepare($sql)->execute();
         } catch (PDOException $e) {
             throw $this->processException($e);
         }
@@ -1028,7 +1031,8 @@ public function createDocument(string $collection, Document $document): Document
         try {
             $this->execute($stmt);
             $lastInsertedId = $this->getPDO()->lastInsertId();
-            $document['$internalId'] = $lastInsertedId;
+            // internalId can be manually as well
+            $document['$internalId'] ??= $lastInsertedId;
 
             if (isset($stmtPermissions)) {
                 $this->execute($stmtPermissions);

src/Database/Database.php

@@ -3046,10 +3046,11 @@ public function createIndex(string $collection, string $id, string $type, array
 
         /** @var array<Document> $collectionAttributes */
         $collectionAttributes = $collection->getAttribute('attributes', []);
-
+        $indexAttributesWithTypes = [];
         foreach ($attributes as $i => $attr) {
             foreach ($collectionAttributes as $collectionAttribute) {
                 if ($collectionAttribute->getAttribute('key') === $attr) {
+                    $indexAttributesWithTypes[$attr] = $collectionAttribute->getAttribute('type');
 
                     /**
                      * mysql does not save length in collection when length = attributes size
@@ -3095,7 +3096,7 @@ public function createIndex(string $collection, string $id, string $type, array
         }
 
         try {
-            $created = $this->adapter->createIndex($collection->getId(), $id, $type, $attributes, $lengths, $orders);
+            $created = $this->adapter->createIndex($collection->getId(), $id, $type, $attributes, $lengths, $orders, $indexAttributesWithTypes);
 
             if (!$created) {
                 throw new DatabaseException('Failed to create index');
@@ -3656,7 +3657,6 @@ public function createDocument(string $collection, Document $document): Document
             if ($this->resolveRelationships) {
                 $document = $this->silent(fn () => $this->createDocumentRelationships($collection, $document));
             }
-
             return $this->adapter->createDocument($collection->getId(), $document);
         });