fix(database): prevent non-object model queries from trying to use the model class (#1239)

Author: brendt

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

@@ -59,6 +59,10 @@ public function first(mixed ...$bindings): mixed
     {
         $query = $this->build(...$bindings);
 
+        if (! $this->modelDefinition) {
+            return $query->fetchFirst();
+        }
+
         $result = map($query)->collection()->to($this->modelClass);
 
         if ($result === []) {
@@ -79,7 +83,13 @@ public function get(Id $id): mixed
     /** @return TModelClass[] */
     public function all(mixed ...$bindings): array
     {
-        return map($this->build(...$bindings))->collection()->to($this->modelClass);
+        $query = $this->build(...$bindings);
+
+        if (! $this->modelDefinition) {
+            return $query->fetch();
+        }
+
+        return map($query)->collection()->to($this->modelClass);
     }
 
     /**
@@ -124,7 +134,14 @@ public function orWhere(string $where, mixed ...$bindings): self
     /** @return self<TModelClass> */
     public function whereField(string $field, mixed $value): self
     {
-        $field = $this->modelDefinition->getFieldDefinition($field);
+        if ($this->modelDefinition) {
+            $field = $this->modelDefinition->getFieldDefinition($field);
+        } else {
+            $field = new FieldDefinition(
+                $this->resolveTable($this->modelClass),
+                $field,
+            );
+        }
 
         return $this->where("{$field} = :{$field->name}", ...[$field->name => $value]);
     }

tests/Integration/Database/Builder/DeleteQueryBuilderTest.php

@@ -4,6 +4,8 @@
 
 use Tempest\Database\Builder\QueryBuilders\DeleteQueryBuilder;
 use Tempest\Database\Id;
+use Tempest\Database\Migrations\CreateMigrationsTable;
+use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
@@ -97,4 +99,20 @@ public function test_delete_on_plain_table_with_conditions(): void
             $query->bindings[0],
         );
     }
+
+    public function test_delete_with_non_object_model(): void
+    {
+        $this->migrate(CreateMigrationsTable::class, CreateAuthorTable::class);
+
+        query('authors')->insert(
+            ['id' => 1, 'name' => 'Brent'],
+            ['id' => 2, 'name' => 'Other'],
+        )->execute();
+
+        query('authors')->delete()->where('id = ?', 1)->execute();
+
+        $count = query('authors')->count()->where('id = ?', 1)->execute();
+
+        $this->assertSame(0, $count);
+    }
 }

tests/Integration/Database/Builder/InsertQueryBuilderTest.php

@@ -205,4 +205,18 @@ public function test_then_method(): void
         $this->assertSame('Chapter 02', $book->chapters[2]->title);
         $this->assertSame('Chapter 03', $book->chapters[3]->title);
     }
+
+    public function test_insert_with_non_object_model(): void
+    {
+        $this->migrate(CreateMigrationsTable::class, CreateAuthorTable::class);
+
+        query('authors')->insert(
+            ['id' => 1, 'name' => 'Brent'],
+            ['id' => 2, 'name' => 'Other'],
+        )->execute();
+
+        $count = query('authors')->count()->execute();
+
+        $this->assertSame(2, $count);
+    }
 }

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -5,10 +5,14 @@
 namespace Tests\Tempest\Integration\Database\Builder;
 
 use Tempest\Database\Builder\QueryBuilders\SelectQueryBuilder;
+use Tempest\Database\Database;
 use Tempest\Database\Migrations\CreateMigrationsTable;
+use Tempest\Database\Query;
+use Tempest\Database\QueryStatements\CreateTableStatement;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
+use Tests\Tempest\Fixtures\Modules\Books\Models\AuthorType;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
 
@@ -230,4 +234,42 @@ public function test_select_query_with_conditions(): void
         $this->assertSame($expected, $sql);
         $this->assertSame(['Timeline Taxi', '1', '2025-01-01'], $bindings);
     }
+
+    public function test_select_first_with_non_object_model(): void
+    {
+        $this->migrate(CreateMigrationsTable::class, CreateAuthorTable::class);
+
+        query('authors')->insert(
+            ['id' => 1, 'name' => 'Brent'],
+            ['id' => 2, 'name' => 'Other'],
+        )->execute();
+
+        $author = query('authors')
+            ->select()
+            ->whereField('id', 2)
+            ->first();
+
+        $this->assertSame(['id' => 2, 'name' => 'Other', 'type' => null], $author);
+    }
+
+    public function test_select_all_with_non_object_model(): void
+    {
+        $this->migrate(CreateMigrationsTable::class, CreateAuthorTable::class);
+
+        query('authors')->insert(
+            ['id' => 1, 'name' => 'Brent', 'type' => AuthorType::B],
+            ['id' => 2, 'name' => 'Other', 'type' => null],
+            ['id' => 3, 'name' => 'Another', 'type' => AuthorType::A],
+        )->execute();
+
+        $authors = query('authors')
+            ->select()
+            ->where('name <> ?', 'Brent')
+            ->all();
+
+        $this->assertSame(
+            [['id' => 2, 'name' => 'Other', 'type' => null], ['id' => 3, 'name' => 'Another', 'type' => 'a']],
+            $authors,
+        );
+    }
 }

tests/Integration/Database/Builder/UpdateQueryBuilderTest.php

@@ -8,7 +8,9 @@
 use Tempest\Database\Exceptions\CannotUpdateHasOneRelation;
 use Tempest\Database\Exceptions\InvalidUpdateStatement;
 use Tempest\Database\Id;
+use Tempest\Database\Migrations\CreateMigrationsTable;
 use Tempest\Database\Query;
+use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\AuthorType;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
@@ -260,4 +262,22 @@ public function test_update_on_plain_table_with_conditions(): void
             $query->bindings,
         );
     }
+
+    public function test_update_with_non_object_model(): void
+    {
+        $this->migrate(CreateMigrationsTable::class, CreateAuthorTable::class);
+
+        query('authors')->insert(
+            ['id' => 1, 'name' => 'Brent'],
+            ['id' => 2, 'name' => 'Other'],
+        )->execute();
+
+        query('authors')->update(
+            name: 'Brendt',
+        )->where('id = ?', 1)->execute();
+
+        $count = query('authors')->count()->where('name = ?', 'Brendt')->execute();
+
+        $this->assertSame(1, $count);
+    }
 }