wip

Author: brendt

packages/database/src/BelongsTo.php

@@ -60,9 +60,11 @@ public function getSelectFields(): ImmutableArray
             ->map(function ($field) use ($relationModel) {
                 return new FieldStatement(
                     $relationModel->getTableName() . '.' . $field,
-                )->withAlias(
-                    sprintf('%s.%s', $this->property->getName(), $field)
-                )->withAliasPrefix($this->parent);
+                )
+                    ->withAlias(
+                        sprintf('%s.%s', $this->property->getName(), $field),
+                    )
+                    ->withAliasPrefix($this->parent);
             });
     }
 

packages/database/src/HasMany.php

@@ -44,9 +44,11 @@ public function getSelectFields(): ImmutableArray
             ->getSelectFields()
             ->map(fn ($field) => new FieldStatement(
                 $relationModel->getTableName() . '.' . $field,
-            )->withAlias(
-                sprintf('%s.%s', $this->property->getName(), $field),
-            )->withAliasPrefix($this->parent));
+            )
+                ->withAlias(
+                    sprintf('%s.%s', $this->property->getName(), $field),
+                )
+                ->withAliasPrefix($this->parent));
     }
 
     public function primaryKey(): string
@@ -60,7 +62,7 @@ public function idField(): string
 
         return sprintf(
             '%s.%s',
-            $relationModel->getTableName(),
+            $this->property->getName(),
             $relationModel->getPrimaryKey(),
         );
     }

packages/database/src/HasOne.php

@@ -44,9 +44,11 @@ public function getSelectFields(): ImmutableArray
             ->getSelectFields()
             ->map(fn ($field) => new FieldStatement(
                 $relationModel->getTableName() . '.' . $field,
-            )->withAlias(
-                sprintf('%s.%s', $this->property->getName(), $field)
-            )->withAliasPrefix($this->parent));
+            )
+                ->withAlias(
+                    sprintf('%s.%s', $this->property->getName(), $field),
+                )
+                ->withAliasPrefix($this->parent));
     }
 
     public function getJoinStatement(): JoinStatement

packages/database/src/Mappers/SelectModelMapper.php

@@ -9,8 +9,8 @@
 use Tempest\Database\HasOne;
 use Tempest\Discovery\SkipDiscovery;
 use Tempest\Mapper\Mapper;
-
 use Tempest\Support\Arr\MutableArray;
+
 use function Tempest\Database\model;
 use function Tempest\map;
 use function Tempest\Support\arr;
@@ -55,7 +55,7 @@ private function values(ModelInspector $model, array $data): array
         foreach ($data as $key => $value) {
             $relation = $model->getRelation($key);
 
-            if (! $relation instanceof HasMany) {
+            if (! ($relation instanceof HasMany)) {
                 continue;
             }
 
@@ -99,9 +99,7 @@ public function normalizeRow(ModelInspector $model, array $row, MutableArray $da
                     $key .= $relation->name . '.';
                     $originalKey .= $relation->name . '.';
                 } elseif ($relation instanceof HasMany) {
-                    $hasManyId = $data->get($key . $relation->idField())
-                        ?? $row[$originalKey . $relation->idField()]
-                        ?? null;
+                    $hasManyId = $data->get($key . $relation->idField()) ?? $row[$originalKey . $relation->idField()] ?? null;
 
                     $originalKey .= $relation->name . '.';
 

packages/database/src/QueryStatements/FieldStatement.php

@@ -33,7 +33,7 @@ public function compile(DatabaseDialect $dialect): string
                     $aliasPrefix,
                     str_replace('`', '', $field),
                 );
-            } elseif($this->alias) {
+            } elseif ($this->alias) {
                 $alias = sprintf(
                     '`%s%s`',
                     $aliasPrefix,

packages/database/tests/QueryStatements/SelectStatementTest.php

@@ -49,13 +49,13 @@ public function test_select(): void
         $this->assertSame($expectedWithBackticks, $statement->compile(DatabaseDialect::POSTGRESQL));
 
         $expectedWithoutBackticks = <<<SQL
-        SELECT a, b, c, bar.d AS d_alias
-        FROM foo AS bar
+        SELECT a, b, c, bar.d AS `d_alias`
+        FROM `foo` AS `bar`
         INNER JOIN foo ON bar.id = foo.id
-        WHERE foo = "bar"
-        ORDER BY foo DESC
-        GROUP BY foo
-        HAVING foo = "bar"
+        WHERE `foo` = "bar"
+        ORDER BY `foo` DESC
+        GROUP BY `foo`
+        HAVING `foo` = "bar"
         LIMIT 10
         OFFSET 100
         SQL;

tests/Integration/Database/Mappers/SelectModelMapperTest.php

@@ -2,6 +2,7 @@
 
 namespace Integration\Database\Mappers;
 
+use Tempest\Auth\Install\User;
 use Tempest\Database\Mappers\SelectModelMapper;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Book;
@@ -102,6 +103,25 @@ public function test_deeply_nested_has_many_map(): void
         $this->assertCount(2, $authors[0]->books[0]->chapters);
     }
 
+    public function test_map_user_permissions(): void
+    {
+        $data = [
+            [
+                'users.password' => '$2y$12$sH1n2N7iE6F8RNDceiAHG.WWtXU7j9f2IBwsi3zIb.QMvn0Cwxpi6',
+                'users.name' => 'Brent',
+                'users.email' => '[email protected]',
+                'users.id' => 1,
+                'userPermissions.user_id' => 1,
+                'userPermissions.permission_id' => 1,
+                'userPermissions.id' => 1,
+            ],
+        ];
+
+        $users = map($data)->with(SelectModelMapper::class)->to(User::class);
+
+        $this->assertCount(1, $users[0]->userPermissions);
+    }
+
     private function data(): array
     {
         return [