wip

Author: brendt

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

@@ -7,7 +7,7 @@
 use Closure;
 use Tempest\Database\Builder\FieldDefinition;
 use Tempest\Database\Builder\ModelDefinition;
-use Tempest\Database\Builder\TableDefinition;
+use Tempest\Database\Builder\ModelInspector;
 use Tempest\Database\Id;
 use Tempest\Database\Mappers\SelectModelMapper;
 use Tempest\Database\Query;
@@ -33,7 +33,7 @@ final class SelectQueryBuilder implements BuildsQuery
     /** @var class-string<TModelClass> $modelClass */
     private readonly string $modelClass;
 
-    private ?ModelDefinition $modelDefinition;
+    private ModelInspector $model;
 
     private SelectStatement $select;
 
@@ -45,15 +45,14 @@ final class SelectQueryBuilder implements BuildsQuery
 
     public function __construct(string|object $model, ?ImmutableArray $fields = null)
     {
-        $this->modelDefinition = ModelDefinition::tryFrom($model);
         $this->modelClass = is_object($model) ? $model::class : $model;
-        $model = model($this->modelClass);
+        $this->model = model($this->modelClass);
 
         $this->select = new SelectStatement(
-            table: $this->resolveTable($model),
-            fields: $fields ?? $model
-                ->getSelectFields()
-                ->map(fn (string $fieldName) => new FieldStatement("{$model->getTableName()}.{$fieldName}")->withAlias()),
+            table: $this->model->getTableDefinition(),
+            fields: $fields ?? $this->model
+            ->getSelectFields()
+            ->map(fn (string $fieldName) => new FieldStatement("{$this->model->getTableName()}.{$fieldName}")->withAlias()),
         );
     }
 
@@ -64,7 +63,7 @@ public function first(mixed ...$bindings): mixed
     {
         $query = $this->build(...$bindings);
 
-        if (! $this->modelDefinition) {
+        if (! $this->model->isObjectModel()) {
             return $query->fetchFirst();
         }
 
@@ -92,7 +91,7 @@ public function all(mixed ...$bindings): array
     {
         $query = $this->build(...$bindings);
 
-        if (! $this->modelDefinition) {
+        if (! $this->model->isObjectModel()) {
             return $query->fetch();
         }
 
@@ -143,14 +142,10 @@ public function orWhere(string $where, mixed ...$bindings): self
     /** @return self<TModelClass> */
     public function whereField(string $field, mixed $value): self
     {
-        if ($this->modelDefinition) {
-            $field = $this->modelDefinition->getFieldDefinition($field);
-        } else {
-            $field = new FieldDefinition(
-                $this->resolveTable($this->modelClass),
-                $field,
-            );
-        }
+        $field = new FieldDefinition(
+            $this->model->getTableDefinition(),
+            $field,
+        );
 
         return $this->where("{$field} = :{$field->name}", ...[$field->name => $value]);
     }
@@ -238,15 +233,6 @@ private function clone(): self
         return clone $this;
     }
 
-    private function resolveTable(string|object $model): TableDefinition
-    {
-        if ($this->modelDefinition === null) {
-            return new TableDefinition($model);
-        }
-
-        return $this->modelDefinition->getTableDefinition();
-    }
-
     /** @return \Tempest\Database\Relation[] */
     private function getIncludedRelations(): array
     {

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -123,7 +123,7 @@ public function test_insert_on_model_table_with_new_relation(): void
         VALUES (?)
         SQL;
 
-        $this->assertSame($expectedAuthorQuery, $authorQuery->getSql());
+        $this->assertSame($expectedAuthorQuery, $authorQuery->toSql());
         $this->assertSame('Brent', $authorQuery->bindings[0]);
     }
 
@@ -201,9 +201,9 @@ public function test_then_method(): void
         $book = Book::select()->with('chapters')->get($id);
 
         $this->assertCount(3, $book->chapters);
-        $this->assertSame('Chapter 01', $book->chapters[1]->title);
-        $this->assertSame('Chapter 02', $book->chapters[2]->title);
-        $this->assertSame('Chapter 03', $book->chapters[3]->title);
+        $this->assertSame('Chapter 01', $book->chapters[0]->title);
+        $this->assertSame('Chapter 02', $book->chapters[1]->title);
+        $this->assertSame('Chapter 03', $book->chapters[2]->title);
     }
 
     public function test_insert_with_non_object_model(): void

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -33,7 +33,7 @@ public function test_select_query(): void
             ->build();
 
         $expected = <<<SQL
-        SELECT `title`, `index`
+        SELECT title, index
         FROM `chapters`
         WHERE `title` = ?
         AND `index` <> ?
@@ -69,7 +69,7 @@ public function test_select_from_model(): void
         $sql = $query->toSql();
 
         $expected = <<<SQL
-        SELECT `authors`.`name` AS `authors.name`, `authors`.`type` AS `authors.type`, `authors`.`id` AS `authors.id`
+        SELECT authors.name AS `authors.name`, authors.type AS `authors.type`, authors.id AS `authors.id`
         FROM `authors`
         SQL;
 
@@ -241,7 +241,7 @@ public function test_select_query_with_conditions(): void
             ->build();
 
         $expected = <<<SQL
-        SELECT `title`, `index`
+        SELECT title, index
         FROM `chapters`
         WHERE `title` = ?
         AND `index` <> ?

tests/Integration/Database/Builder/UpdateQueryBuilderTest.php

@@ -175,7 +175,7 @@ public function test_insert_new_relation_on_update(): void
             INSERT INTO `authors` (`name`)
             VALUES (?)
             SQL,
-            $authorQuery->getSql(),
+            $authorQuery->toSql(),
         );
 
         $this->assertSame(['Brent'], $authorQuery->bindings);