wip

Author: brendt

packages/database/src/Database.php

@@ -5,9 +5,14 @@
 namespace Tempest\Database;
 
 use Tempest\Database\Builder\QueryBuilders\BuildsQuery;
+use Tempest\Database\Config\DatabaseDialect;
 
 interface Database
 {
+    public DatabaseDialect $dialect {
+        get;
+    }
+
     public function execute(BuildsQuery|Query $query): void;
 
     public function getLastInsertId(): ?Id;

packages/database/src/DatabaseDialectInitializer.php

@@ -35,7 +35,7 @@ final class MigrationManager
     }
 
     private DatabaseDialect $dialect {
-        get => $this->container->get(DatabaseDialect::class, $this->onDatabase);
+        get => $this->database->dialect;
     }
 
     public function __construct(

packages/database/src/Migrations/MigrationManager.php

@@ -17,7 +17,7 @@ final class Query
     }
 
     private DatabaseDialect $dialect {
-        get => get(DatabaseDialect::class, $this->onDatabase);
+        get => $this->database->dialect;
     }
 
     public function __construct(

packages/database/src/Query.php

@@ -3,6 +3,7 @@
 namespace Tests\Tempest\Integration\Database\Builder;
 
 use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\Database;
 use Tempest\Database\Exceptions\CannotInsertHasManyRelation;
 use Tempest\Database\Exceptions\CannotInsertHasOneRelation;
 use Tempest\Database\Id;
@@ -228,7 +229,7 @@ public function test_insert_with_non_object_model(): void
 
     private function buildExpectedInsert(string $query): string
     {
-        if ($this->container->get(DatabaseDialect::class) === DatabaseDialect::POSTGRESQL) {
+        if ($this->container->get(Database::class)->dialect === DatabaseDialect::POSTGRESQL) {
             $query .= ' RETURNING *';
         }
 

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -4,6 +4,7 @@
 
 use Tempest\Database\Builder\QueryBuilders\UpdateQueryBuilder;
 use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\Database;
 use Tempest\Database\Exceptions\CannotUpdateHasManyRelation;
 use Tempest\Database\Exceptions\CannotUpdateHasOneRelation;
 use Tempest\Database\Exceptions\InvalidUpdateStatement;
@@ -175,7 +176,7 @@ public function test_insert_new_relation_on_update(): void
         VALUES (?)
         SQL;
 
-        if ($this->container->get(DatabaseDialect::class) === DatabaseDialect::POSTGRESQL) {
+        if ($this->container->get(Database::class)->dialect === DatabaseDialect::POSTGRESQL) {
             $expected .= ' RETURNING *';
         }
 

tests/Integration/Database/Builder/UpdateQueryBuilderTest.php

@@ -7,6 +7,7 @@
 use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\Config\MysqlConfig;
 use Tempest\Database\Config\SQLiteConfig;
+use Tempest\Database\Database;
 use Tempest\Database\DatabaseInitializer;
 use Tempest\Database\Id;
 use Tempest\Database\Migrations\CreateMigrationsTable;
@@ -125,7 +126,7 @@ public function test_with_multiple_connections(): void
 
     public function test_with_different_dialects(): void
     {
-        if ($this->container->get(DatabaseDialect::class) !== DatabaseDialect::MYSQL) {
+        if ($this->container->get(Database::class)->dialect !== DatabaseDialect::MYSQL) {
             $this->markTestSkipped('We only test this in the MySQL test action');
         }
 

tests/Integration/Database/MultiDatabaseTest.php

@@ -7,6 +7,7 @@
 use RuntimeException;
 use Tempest\Database\Config\DatabaseConfig;
 use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\Database;
 use Tempest\Database\DatabaseMigration;
 use Tempest\Database\Exceptions\InvalidDefaultValue;
 use Tempest\Database\Exceptions\InvalidValue;
@@ -120,7 +121,7 @@ public function test_enum_statement(): void
     {
         $this->migrate(CreateMigrationsTable::class);
 
-        if ($this->container->get(DatabaseDialect::class) === DatabaseDialect::POSTGRESQL) {
+        if ($this->container->get(Database::class)->dialect === DatabaseDialect::POSTGRESQL) {
             $enumTypeMigration = new class() implements DatabaseMigration {
                 public string $name = '0';
 

tests/Integration/Database/QueryStatements/CreateTableStatementTest.php

@@ -6,6 +6,7 @@
 
 use Tempest\Database\Builder\QueryBuilders\UpdateQueryBuilder;
 use Tempest\Database\Config\DatabaseDialect;
+use Tempest\Database\Database;
 use Tempest\Database\Id;
 use Tempest\Database\Query;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
@@ -25,7 +26,7 @@ public function test_insert_query(): void
 
         $query = query(Author::class)->insert($author)->build();
 
-        $dialect = $this->container->get(DatabaseDialect::class);
+        $dialect = $this->container->get(Database::class)->dialect;
 
         $expected = match ($dialect) {
             DatabaseDialect::POSTGRESQL => <<<'SQL'
@@ -48,7 +49,7 @@ public function test_update_query(): void
 
         $query = query($author)->update(name: 'other')->build();
 
-        $dialect = $this->container->get(DatabaseDialect::class);
+        $dialect = $this->container->get(Database::class)->dialect;
 
         $expected = match ($dialect) {
             DatabaseDialect::POSTGRESQL => <<<'SQL'

tests/Integration/ORM/Mappers/QueryMapperTest.php

@@ -8,7 +8,6 @@
 use Tempest\Container\DynamicInitializer;
 use Tempest\Container\Singleton;
 use Tempest\Database\Config\DatabaseConfig;
-use Tempest\Database\Config\DatabaseDialect;
 use Tempest\Database\Connection\Connection;
 use Tempest\Database\Connection\PDOConnection;
 use Tempest\Database\Database;