wip

brendt · brendt · commit 783266158237 · 2025-05-15T08:54:11.000+02:00
diff --git a/packages/database/src/BelongsTo.php b/packages/database/src/BelongsTo.php
@@ -10,6 +10,7 @@
 use Tempest\Database\QueryStatements\JoinStatement;
 use Tempest\Reflection\PropertyReflector;
 use Tempest\Support\Arr\ImmutableArray;
+
 use function Tempest\Support\str;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
@@ -64,10 +65,7 @@ private function getRelationJoin(ModelInspector $relationModel): string
         $relationJoin = $this->relationJoin;
 
         if ($relationJoin && ! strpos($relationJoin, '.')) {
-            $relationJoin = sprintf('%s.%s',
-                $relationModel->getTableName(),
-                $relationJoin,
-            );
+            $relationJoin = sprintf('%s.%s', $relationModel->getTableName(), $relationJoin);
         }
 
         if ($relationJoin) {
@@ -86,10 +84,7 @@ private function getOwnerJoin(ModelInspector $ownerModel): string
         $ownerJoin = $this->ownerJoin;
 
         if ($ownerJoin && ! strpos($ownerJoin, '.')) {
-            $ownerJoin = sprintf('%s.%s',
-                $ownerModel->getTableName(),
-                $ownerJoin,
-            );
+            $ownerJoin = sprintf('%s.%s', $ownerModel->getTableName(), $ownerJoin);
         }
 
         if ($ownerJoin) {
diff --git a/packages/database/src/Builder/ModelInspector.php b/packages/database/src/Builder/ModelInspector.php
@@ -28,8 +28,7 @@ final class ModelInspector
 
     public function __construct(
         private object|string $model,
-    )
-    {
+    ) {
         if ($this->model instanceof ClassReflector) {
             $this->modelClass = $this->model;
         } else {
@@ -215,11 +214,9 @@ public function getSelectFields(): ImmutableArray
 
     public function getRelation(string|PropertyReflector $name): ?Relation
     {
-        $name = $name instanceof PropertyReflector ? $name->getName() : $name;
+        $name = ($name instanceof PropertyReflector) ? $name->getName() : $name;
 
-        return $this->getBelongsTo($name)
-            ?? $this->getHasOne($name)
-            ?? $this->getHasMany($name);
+        return $this->getBelongsTo($name) ?? $this->getHasOne($name) ?? $this->getHasMany($name);
     }
 
     public function getEagerRelations(): array
diff --git a/packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php b/packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php
@@ -228,7 +228,7 @@ public function build(mixed ...$bindings): Query
 
         foreach ($this->getIncludedRelations() as $relation) {
             $this->select->fields = $this->select->fields->append(
-                ...$relation->getSelectFields()
+                ...$relation->getSelectFields(),
             );
 
             $this->select->join[] = $relation->getJoinStatement();
diff --git a/packages/database/src/HasMany.php b/packages/database/src/HasMany.php
@@ -10,6 +10,7 @@
 use Tempest\Database\QueryStatements\JoinStatement;
 use Tempest\Reflection\PropertyReflector;
 use Tempest\Support\Arr\ImmutableArray;
+
 use function Tempest\Support\str;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
diff --git a/packages/database/src/HasOne.php b/packages/database/src/HasOne.php
@@ -10,6 +10,7 @@
 use Tempest\Database\QueryStatements\JoinStatement;
 use Tempest\Reflection\PropertyReflector;
 use Tempest\Support\Arr\ImmutableArray;
+
 use function Tempest\Support\str;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
diff --git a/packages/database/src/Mappers/SelectModelMapper.php b/packages/database/src/Mappers/SelectModelMapper.php
@@ -5,6 +5,7 @@
 use Tempest\Database\Builder\ModelInspector;
 use Tempest\Discovery\SkipDiscovery;
 use Tempest\Mapper\Mapper;
+
 use function Tempest\Database\model;
 use function Tempest\map;
 use function Tempest\Support\arr;
@@ -77,4 +78,4 @@ private function normalizeFields(ModelInspector $model, array $rows): array
 
         return $data;
     }
-}
+}
diff --git a/packages/database/src/QueryStatements/FieldStatement.php b/packages/database/src/QueryStatements/FieldStatement.php
@@ -37,10 +37,12 @@ public function compile(DatabaseDialect $dialect): string
 
         $field = arr(explode('.', $field))
             ->map(fn (string $part) => trim($part, '` '))
-            ->map(fn (string $part) => match ($dialect) {
-                DatabaseDialect::SQLITE => $part,
-                default => sprintf('`%s`', $part),
-            })
+            ->map(
+                fn (string $part) => match ($dialect) {
+                    DatabaseDialect::SQLITE => $part,
+                    default => sprintf('`%s`', $part),
+                },
+            )
             ->implode('.');
 
         if ($alias === null) {
diff --git a/packages/database/src/QueryStatements/SelectStatement.php b/packages/database/src/QueryStatements/SelectStatement.php
@@ -30,7 +30,7 @@ public function compile(DatabaseDialect $dialect): string
             ? '*'
             : $this->fields
                 ->map(function (string|Stringable|FieldStatement $field) use ($dialect) {
-                    if (! $field instanceof FieldStatement) {
+                    if (! ($field instanceof FieldStatement)) {
                         $field = new FieldStatement($field);
                     }
 
@@ -92,9 +92,9 @@ public function compile(DatabaseDialect $dialect): string
         /* TODO: this should be improved.
          * More specifically, \Tempest\Database\Builder\FieldDefinition should be aware of the dialect,
          * or the whole ORM should be refactored to use \Tempest\Database\QueryStatements\FieldStatement*/
-//        if ($dialect === DatabaseDialect::SQLITE) {
-//            $compiled = $compiled->replace('`', '');
-//        }
+        //        if ($dialect === DatabaseDialect::SQLITE) {
+        //            $compiled = $compiled->replace('`', '');
+        //        }
 
         return $compiled;
     }
diff --git a/packages/database/src/Relation.php b/packages/database/src/Relation.php
@@ -11,4 +11,4 @@ interface Relation extends PropertyAttribute
     public function getSelectFields(): ImmutableArray;
 
     public function getJoinStatement(): JoinStatement;
-}
+}
diff --git a/packages/database/tests/QueryStatements/FieldStatementTest.php b/packages/database/tests/QueryStatements/FieldStatementTest.php
@@ -69,12 +69,16 @@ public function test_with_alias(): void
     {
         $this->assertSame(
             'authors.name AS `authors.name`',
-            new FieldStatement('authors.name')->withAlias()->compile(DatabaseDialect::SQLITE),
+            new FieldStatement('authors.name')
+                ->withAlias()
+                ->compile(DatabaseDialect::SQLITE),
         );
 
         $this->assertSame(
             '`authors`.`name` AS `authors.name`',
-            new FieldStatement('`authors`.`name`')->withAlias()->compile(DatabaseDialect::MYSQL),
+            new FieldStatement('`authors`.`name`')
+                ->withAlias()
+                ->compile(DatabaseDialect::MYSQL),
         );
     }
 }
diff --git a/packages/reflection/src/PropertyAttribute.php b/packages/reflection/src/PropertyAttribute.php
@@ -8,4 +8,4 @@ interface PropertyAttribute
         set;
         get;
     }
-}
+}
diff --git a/packages/reflection/tests/Fixtures/AttributeImplementingPropertyAttribute.php b/packages/reflection/tests/Fixtures/AttributeImplementingPropertyAttribute.php
@@ -10,4 +10,4 @@
 final class AttributeImplementingPropertyAttribute implements PropertyAttribute
 {
     public PropertyReflector $property;
-}
+}
diff --git a/packages/reflection/tests/Fixtures/ClassWithPropertyWithAttributeImplementingPropertyAttribute.php b/packages/reflection/tests/Fixtures/ClassWithPropertyWithAttributeImplementingPropertyAttribute.php
@@ -6,4 +6,4 @@ final class ClassWithPropertyWithAttributeImplementingPropertyAttribute
 {
     #[AttributeImplementingPropertyAttribute]
     public string $prop;
-}
+}
diff --git a/packages/reflection/tests/Fixtures/HasAttributeTest.php b/packages/reflection/tests/Fixtures/HasAttributeTest.php
@@ -15,4 +15,4 @@ public function test_property_attribute(): void
 
         $this->assertSame('prop', $attribute->property->getName());
     }
-}
+}
diff --git a/tests/Integration/Database/BelongsToTest.php b/tests/Integration/Database/BelongsToTest.php
@@ -6,6 +6,7 @@
 use Tempest\Database\Config\DatabaseDialect;
 use Tests\Tempest\Integration\Database\Fixtures\OwnerModel;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\Database\model;
 
 final class BelongsToTest extends FrameworkIntegrationTestCase
@@ -74,4 +75,4 @@ public function test_belongs_to_with_owner_join_field_and_table(): void
             $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
-}
+}
diff --git a/tests/Integration/Database/HasManyTest.php b/tests/Integration/Database/HasManyTest.php
@@ -6,6 +6,7 @@
 use Tempest\Database\HasMany;
 use Tests\Tempest\Integration\Database\Fixtures\RelationModel;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\Database\model;
 
 final class HasManyTest extends FrameworkIntegrationTestCase
@@ -18,7 +19,7 @@ public function test_has_many(): void
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -30,7 +31,7 @@ public function test_has_many_with_overwritten_owner_join_field(): void
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.overwritten_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -42,7 +43,7 @@ public function test_has_many_with_overwritten_owner_join_field_and_table(): voi
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON overwritten.overwritten_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -54,7 +55,7 @@ public function test_has_many_with_overwritten_relation_join_field(): void
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = relation.overwritten_id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -66,7 +67,7 @@ public function test_has_many_with_overwritten_relation_join_field_and_table():
         $this->assertInstanceOf(HasMany::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = overwritten.overwritten_id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
-}
+}
diff --git a/tests/Integration/Database/HasOneTest.php b/tests/Integration/Database/HasOneTest.php
@@ -6,6 +6,7 @@
 use Tempest\Database\HasOne;
 use Tests\Tempest\Integration\Database\Fixtures\HasOneRelationModel;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\Database\model;
 
 final class HasOneTest extends FrameworkIntegrationTestCase
@@ -18,7 +19,7 @@ public function test_has_one(): void
         $this->assertInstanceOf(HasOne::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -30,7 +31,7 @@ public function test_has_one_with_overwritten_owner_join_field(): void
         $this->assertInstanceOf(HasOne::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.overwritten_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -42,7 +43,7 @@ public function test_has_one_with_overwritten_owner_join_field_and_table(): void
         $this->assertInstanceOf(HasOne::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON overwritten.overwritten_id = relation.id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -54,7 +55,7 @@ public function test_has_one_with_overwritten_relation_join_field(): void
         $this->assertInstanceOf(HasOne::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = relation.overwritten_id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
 
@@ -66,7 +67,7 @@ public function test_has_one_with_overwritten_relation_join_field_and_table(): v
         $this->assertInstanceOf(HasOne::class, $relation);
         $this->assertSame(
             'LEFT JOIN owner ON owner.relation_id = overwritten.overwritten_id',
-            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE)
+            $relation->getJoinStatement()->compile(DatabaseDialect::SQLITE),
         );
     }
-}
+}
diff --git a/tests/Integration/Database/Mappers/SelectModelMapperTest.php b/tests/Integration/Database/Mappers/SelectModelMapperTest.php
@@ -5,6 +5,7 @@
 use Tempest\Database\Mappers\SelectModelMapper;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
 use Tests\Tempest\Integration\FrameworkIntegrationTestCase;
+
 use function Tempest\map;
 
 final class SelectModelMapperTest extends FrameworkIntegrationTestCase
@@ -167,4 +168,4 @@ private function data(): array
             ],
         ];
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,16 @@ public function test_with_alias(): void`
`69`	`69`	`{`
`70`	`70`	`$this->assertSame(`
`71`	`71`	'authors.name AS `authors.name`',
`72`		`- new FieldStatement('authors.name')->withAlias()->compile(DatabaseDialect::SQLITE),`
	`72`	`+ new FieldStatement('authors.name')`
	`73`	`+ ->withAlias()`
	`74`	`+ ->compile(DatabaseDialect::SQLITE),`
`73`	`75`	`);`
`74`	`76`
`75`	`77`	`$this->assertSame(`
`76`	`78`	'`authors`.`name` AS `authors.name`',
`77`		- new FieldStatement('`authors`.`name`')->withAlias()->compile(DatabaseDialect::MYSQL),
	`79`	+ new FieldStatement('`authors`.`name`')
	`80`	`+ ->withAlias()`
	`81`	`+ ->compile(DatabaseDialect::MYSQL),`
`78`	`82`	`);`
`79`	`83`	`}`
`80`	`84`	`}`