wip

Author: brendt

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

@@ -0,0 +1,10 @@
+<?php
+
+namespace Tempest\Database\Builder\QueryBuilders;
+
+use Tempest\Database\Query;
+
+interface BuildsQuery
+{
+    public function build(mixed ...$bindings): Query;
+}

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

@@ -15,7 +15,7 @@
 /**
  * @template TModelClass of object
  */
-final class CountQueryBuilder
+final class CountQueryBuilder implements BuildsQuery
 {
     use HasConditions;
 
@@ -93,7 +93,7 @@ public function toSql(): string
         return $this->build()->getSql();
     }
 
-    public function build(array $bindings = []): Query
+    public function build(mixed ...$bindings): Query
     {
         return new Query($this->count, [...$this->bindings, ...$bindings]);
     }

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

@@ -14,7 +14,7 @@
 /**
  * @template TModelClass of object
  */
-final class DeleteQueryBuilder
+final class DeleteQueryBuilder implements BuildsQuery
 {
     use HasConditions;
 
@@ -61,8 +61,8 @@ public function bind(mixed ...$bindings): self
         return $this;
     }
 
-    public function build(): Query
+    public function build(mixed ...$bindings): Query
     {
-        return new Query($this->delete, $this->bindings);
+        return new Query($this->delete, [...$this->bindings, ...$bindings]);
     }
 }

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

@@ -2,6 +2,7 @@
 
 namespace Tempest\Database\Builder\QueryBuilders;
 
+use Closure;
 use Tempest\Database\Builder\ModelDefinition;
 use Tempest\Database\Builder\TableDefinition;
 use Tempest\Database\Id;
@@ -11,27 +12,37 @@
 use Tempest\Reflection\ClassReflector;
 use Tempest\Support\Arr\ImmutableArray;
 
-final readonly class InsertQueryBuilder
+final class InsertQueryBuilder implements BuildsQuery
 {
     private InsertStatement $insert;
 
+    private array $after = [];
+
     public function __construct(
-        private string|object $model,
-        private array $rows,
-        private SerializerFactory $serializerFactory,
+        private readonly string|object $model,
+        private readonly array $rows,
+        private readonly SerializerFactory $serializerFactory,
     ) {
         $this->insert = new InsertStatement($this->resolveTableDefinition());
     }
 
     public function execute(mixed ...$bindings): Id
     {
-        return $this->build()->execute(...$bindings);
+        $id = $this->build()->execute(...$bindings);
+
+        foreach ($this->after as $after) {
+            $query = $after($id);
+
+            if ($query instanceof BuildsQuery) {
+                $query->build()->execute();
+            }
+        }
+
+        return $id;
     }
 
-    public function build(): Query
+    public function build(mixed ...$bindings): Query
     {
-        $bindings = [];
-
         foreach ($this->resolveEntries() as $entry) {
             $this->insert->addEntry($entry);
 
@@ -46,6 +57,13 @@ public function build(): Query
         );
     }
 
+    public function then(Closure ...$callbacks): self
+    {
+        $this->after = [...$this->after, ...$callbacks];
+
+        return $this;
+    }
+
     private function resolveEntries(): array
     {
         $entries = [];
@@ -78,7 +96,7 @@ private function resolveEntries(): array
 
                 $value = $property->getValue($model);
 
-                // BelongsTo and HasMany relations are included
+                // BelongsTo and reverse HasMany relations are included
                 if ($property->getType()->isRelation()) {
                     $column .= '_id';
 

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

@@ -26,7 +26,7 @@
 /**
  * @template TModelClass of object
  */
-final class SelectQueryBuilder
+final class SelectQueryBuilder implements BuildsQuery
 {
     use HasConditions;
 
@@ -57,7 +57,7 @@ public function __construct(string|object $model, ?ImmutableArray $columns = nul
      */
     public function first(mixed ...$bindings): mixed
     {
-        $query = $this->build($bindings);
+        $query = $this->build(...$bindings);
 
         $result = map($query)->collection()->to($this->modelClass);
 
@@ -79,7 +79,7 @@ public function get(Id $id): mixed
     /** @return TModelClass[] */
     public function all(mixed ...$bindings): array
     {
-        return map($this->build($bindings))->collection()->to($this->modelClass);
+        return map($this->build(...$bindings))->collection()->to($this->modelClass);
     }
 
     /**
@@ -182,7 +182,7 @@ public function toSql(): string
         return $this->build()->getSql();
     }
 
-    public function build(array $bindings = []): Query
+    public function build(mixed ...$bindings): Query
     {
         $resolvedRelations = $this->resolveRelations();
 

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

@@ -15,7 +15,7 @@
 use function Tempest\Database\model;
 use function Tempest\Support\arr;
 
-final class UpdateQueryBuilder
+final class UpdateQueryBuilder implements BuildsQuery
 {
     use HasConditions;
 
@@ -61,7 +61,7 @@ public function bind(mixed ...$bindings): self
         return $this;
     }
 
-    public function build(): Query
+    public function build(mixed ...$bindings): Query
     {
         $values = $this->resolveValues();
 
@@ -73,8 +73,6 @@ public function build(): Query
             $this->where('`id` = ?', id: $this->model->id->id);
         }
 
-        $bindings = [];
-
         foreach ($values as $value) {
             $bindings[] = $value;
         }

packages/database/src/Query.php

@@ -13,6 +13,8 @@ final class Query
     public function __construct(
         public string|QueryStatement $sql,
         public array $bindings = [],
+        /** @var \Closure[] $executeAfter */
+        public array $executeAfter = [],
     ) {}
 
     public function execute(mixed ...$bindings): Id

tests/Fixtures/Migrations/CreateChapterTable.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Tempest\Fixtures\Migrations;
+
+use Tempest\Database\DatabaseMigration;
+use Tempest\Database\QueryStatement;
+use Tempest\Database\QueryStatements\CreateTableStatement;
+use Tempest\Database\QueryStatements\DropTableStatement;
+use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
+use Tests\Tempest\Fixtures\Modules\Books\Models\Chapter;
+
+final class CreateChapterTable implements DatabaseMigration
+{
+    private(set) string $name = '0000-00-00_create_chapters_table';
+
+    public function up(): QueryStatement
+    {
+        return CreateTableStatement::forModel(Chapter::class)
+            ->primary()
+            ->text('title')
+            ->text('contents', default: '')
+            ->belongsTo('chapters.book_id', 'books.id');
+    }
+
+    public function down(): QueryStatement
+    {
+        return DropTableStatement::forModel(Book::class);
+    }
+}

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -2,10 +2,11 @@
 
 namespace Tests\Tempest\Integration\Database\Builder;
 
-use Tempest\Database\Exceptions\CannotInsertHasManyRelation;
-use Tempest\Database\Exceptions\CannotUpdateHasManyRelation;
 use Tempest\Database\Id;
+use Tempest\Database\Migrations\CreateMigrationsTable;
 use Tempest\Database\Query;
+use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
+use Tests\Tempest\Fixtures\Migrations\CreateChapterTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\AuthorType;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
@@ -151,15 +152,26 @@ public function test_insert_on_model_table_with_existing_relation(): void
 
     public function test_attach_new_has_many_relation_on_update(): void
     {
-        $this->markTestSkipped('Not implemented yet');
-
-        //        query(Book::class)
-        //            ->insert(
-        //                title: 'Timeline Taxi',
-        //                chapters: [
-        //                    Chapter::new(title: 'Chapter 01'),
-        //                ],
-        //            )
-        //            ->build();
+        $this->migrate(CreateMigrationsTable::class, CreateBookTable::class, CreateChapterTable::class);
+
+        $id = query(Book::class)
+            ->insert(title: 'Timeline Taxi')
+            ->then(
+                fn (Id $id) => query(Chapter::class)->insert(
+                    ['title' => 'Chapter 01', 'book_id' => $id],
+                    ['title' => 'Chapter 02', 'book_id' => $id],
+                ),
+                fn (Id $id) => query(Chapter::class)->insert(
+                    ['title' => 'Chapter 03', 'book_id' => $id],
+                ),
+            )
+            ->execute();
+
+        $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);
     }
 }