wip

Author: brendt

packages/database/src/Builder/QueryBuilders/UpdateQueryBuilder.php

@@ -34,7 +34,7 @@ public function __construct(
         );
     }
 
-    public function execute(mixed ...$bindings): Id
+    public function execute(mixed ...$bindings): Id|null
     {
         return $this->build()->execute(...$bindings);
     }

packages/database/src/Connection/Connection.php

@@ -16,7 +16,7 @@ public function rollback(): bool;
 
     public function lastInsertId(): false|string;
 
-    public function prepare(string $sql): false|PDOStatement;
+    public function prepare(string $sql): PDOStatement;
 
     public function close(): void;
 

packages/database/src/Connection/PDOConnection.php

@@ -13,6 +13,8 @@ final class PDOConnection implements Connection
 {
     private ?PDO $pdo = null;
 
+    private int|string|null $lastInsertId = null;
+
     public function __construct(
         private(set) readonly DatabaseConfig $config,
     ) {}
@@ -53,13 +55,19 @@ public function lastInsertId(): false|string
         return $this->pdo->lastInsertId();
     }
 
-    public function prepare(string $sql): false|PDOStatement
+    public function prepare(string $sql): PDOStatement
     {
         if ($this->pdo === null) {
             throw new ConnectionClosed();
         }
 
-        return $this->pdo->prepare($sql);
+        $statement = $this->pdo->prepare($sql);
+
+        if ($statement === false) {
+            throw new ConnectionClosed();
+        }
+
+        return $statement;
     }
 
     public function close(): void

packages/database/src/Database.php

@@ -8,7 +8,7 @@ interface Database
 {
     public function execute(Query $query): void;
 
-    public function getLastInsertId(): Id;
+    public function getLastInsertId(): Id|null;
 
     public function fetch(Query $query): array;
 

packages/database/src/DatabaseDialectInitializer.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Tempest\Database;
+
+use Tempest\Container\Container;
+use Tempest\Container\Initializer;
+use Tempest\Database\Config\DatabaseConfig;
+use Tempest\Database\Config\DatabaseDialect;
+
+final class DatabaseDialectInitializer implements Initializer
+{
+    public function initialize(Container $container): DatabaseDialect
+    {
+        return $container->get(DatabaseConfig::class)->dialect;
+    }
+}

packages/database/src/DatabaseInitializer.php

@@ -37,6 +37,7 @@ public function initialize(ClassReflector $class, ?string $tag, Container $conta
         return new GenericDatabase(
             $connection,
             new GenericTransactionManager($connection),
+            $container->get(DatabaseConfig::class)->dialect,
         );
     }
 }

packages/database/src/Exceptions/NoLastInsertIdAvailable.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Tempest\Database\Exceptions;
+
+use Exception;
+
+final class NoLastInsertIdAvailable extends Exception
+{
+    public function __construct()
+    {
+        parent::__construct("No last insert id available.");
+    }
+}

packages/database/src/GenericDatabase.php

@@ -8,34 +8,56 @@
 use DateTimeInterface;
 use PDO;
 use PDOException;
+use PDOStatement;
+use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\Connection\Connection;
 use Tempest\Database\Exceptions\QueryException;
 use Tempest\Database\Transactions\TransactionManager;
 use Throwable;
 
-final readonly class GenericDatabase implements Database
+final class GenericDatabase implements Database
 {
+    private PDOStatement|null $lastStatement = null;
+    private Query|null $lastQuery = null;
+
     public function __construct(
-        private(set) Connection $connection,
-        private(set) TransactionManager $transactionManager,
+        private(set) readonly Connection $connection,
+        private(set) readonly TransactionManager $transactionManager,
+        private(set) readonly DatabaseDialect $dialect,
     ) {}
 
     public function execute(Query $query): void
     {
         $bindings = $this->resolveBindings($query);
 
         try {
-            $this->connection
-                ->prepare($query->toSql())
-                ->execute($bindings);
+            $statement = $this->connection->prepare($query->toSql());
+
+            $statement->execute($bindings);
+
+            $this->lastStatement = $statement;
+            $this->lastQuery = $query;
         } catch (PDOException $pdoException) {
             throw new QueryException($query, $bindings, $pdoException);
         }
     }
 
-    public function getLastInsertId(): Id
+    public function getLastInsertId(): Id|null
     {
-        return new Id($this->connection->lastInsertId());
+        $sql = $this->lastQuery->toSql();
+
+        if (! str_starts_with($sql, 'INSERT')) {
+            return null;
+        }
+
+        if ($this->dialect === DatabaseDialect::POSTGRESQL) {
+            $data = $this->lastStatement->fetch(PDO::FETCH_ASSOC);
+            $lastInsertId = $data['id'] ?? null;
+        } else {
+            $lastInsertId = $this->connection->lastInsertId();
+        }
+
+        return new Id($lastInsertId);
     }
 
     public function fetch(Query $query): array

packages/database/src/Migrations/MigrationManager.php

@@ -258,7 +258,8 @@ private function getTableDefinitions(DatabaseDialect $dialect): array
         return array_map(
             fn (array $item) => match ($dialect) {
                 DatabaseDialect::SQLITE => new TableMigrationDefinition($item['name']),
-                default => new TableMigrationDefinition(array_values($item)[0]),
+                DatabaseDialect::POSTGRESQL => new TableMigrationDefinition($item['table_name']),
+                DatabaseDialect::MYSQL => new TableMigrationDefinition(array_values($item)[0]),
             },
             new ShowTablesStatement()->fetch($dialect),
         );

packages/database/src/Query.php

@@ -6,6 +6,7 @@
 
 use Tempest\Database\Config\DatabaseConfig;
 
+use Tempest\Database\Config\DatabaseDialect;
 use function Tempest\get;
 
 final class Query
@@ -17,7 +18,7 @@ public function __construct(
         public array $executeAfter = [],
     ) {}
 
-    public function execute(mixed ...$bindings): Id
+    public function execute(mixed ...$bindings): Id|null
     {
         $this->bindings = [...$this->bindings, ...$bindings];
 
@@ -48,8 +49,14 @@ public function toSql(): string
     {
         $sql = $this->sql;
 
+        $dialect = $this->getDatabaseConfig()->dialect;
+
         if ($sql instanceof QueryStatement) {
-            return $sql->compile($this->getDatabaseConfig()->dialect);
+            $sql = $sql->compile($dialect);
+        }
+
+        if ($dialect === DatabaseDialect::POSTGRESQL) {
+            $sql = str_replace('`', '', $sql);
         }
 
         return $sql;