refactor: use table alias in BelongsToMany joins

Author: laylatichy

packages/database/src/BelongsToMany.php

@@ -54,7 +54,7 @@ public function getSelectFields(): ImmutableArray
             ->map(map: fn (
                 $field,
             ) => new FieldStatement(
-                field: $targetModel->getTableName() . '.' . $field,
+                field: $this->getTableAlias(tableName: $targetModel->getTableName()) . '.' . $field,
             )
                 ->withAlias(
                     alias: sprintf(
@@ -120,7 +120,6 @@ public function getJoinStatement(): JoinStatement
             ownerModel: $ownerModel,
             targetModel: $targetModel,
         );
-
         return new JoinStatement(
             statement: sprintf(
                 '%s %s',
@@ -131,6 +130,7 @@ public function getJoinStatement(): JoinStatement
                 $this->buildSecondJoin(
                     targetModel: $targetModel,
                     pivotTable: $pivotTable,
+                    tableAlias: $this->getTableAlias(tableName: $targetModel->getTableName()),
                 ),
             ),
         );
@@ -174,11 +174,20 @@ private function buildFirstJoin(
     private function buildSecondJoin(
         ModelInspector $targetModel,
         string $pivotTable,
+        string $tableAlias,
     ): string {
+        $tableName = $targetModel->getTableName();
+        $tableRef = $tableAlias !== $tableName
+            ? sprintf('%s AS %s', $tableName, $tableAlias)
+            : $tableName;
+
         return sprintf(
             'LEFT JOIN %s ON %s = %s',
-            $targetModel->getTableName(),
-            $this->resolveRelatedRelationJoin(targetModel: $targetModel),
+            $tableRef,
+            $this->resolveRelatedRelationJoin(
+                targetModel: $targetModel,
+                tableAlias: $tableAlias,
+            ),
             $this->resolveRelatedOwnerJoin(
                 targetModel: $targetModel,
                 pivotTable: $pivotTable,
@@ -316,7 +325,7 @@ private function resolveRelatedOwnerJoin(
     /**
      * PK on target: target.id
      */
-    private function resolveRelatedRelationJoin(ModelInspector $targetModel): string
+    private function resolveRelatedRelationJoin(ModelInspector $targetModel, string $tableAlias): string
     {
         $relatedRelationJoin = $this->relatedRelationJoin;
 
@@ -329,7 +338,7 @@ private function resolveRelatedRelationJoin(ModelInspector $targetModel): string
         ) {
             return sprintf(
                 '%s.%s',
-                $targetModel->getTableName(),
+                $tableAlias,
                 $relatedRelationJoin,
             );
         }
@@ -349,8 +358,17 @@ private function resolveRelatedRelationJoin(ModelInspector $targetModel): string
 
         return sprintf(
             '%s.%s',
-            $targetModel->getTableName(),
+            $tableAlias,
             $primaryKey,
         );
     }
+
+    private function getTableAlias(string $tableName): string
+    {
+        if ($this->parent === null || $this->parent === '') {
+            return $tableName;
+        }
+
+        return str(string: $this->parent)->replace('.', '_')->append('_', $this->property->getName())->toString();
+    }
 }

tests/Integration/Database/Builder/SelectQueryBuilderTest.php

@@ -4,17 +4,17 @@
 
 namespace Tests\Tempest\Integration\Database\Builder;
 
+use Tempest\Database\BelongsToMany;
 use Tempest\Database\Builder\QueryBuilders\SelectQueryBuilder;
 use Tempest\Database\Direction;
+use Tempest\Database\IsDatabaseModel;
 use Tempest\Database\Migrations\CreateMigrationsTable;
+use Tempest\Database\Table;
 use Tests\Tempest\Fixtures\Migrations\CreateAuthorTable;
 use Tests\Tempest\Fixtures\Migrations\CreateBookTable;
 use Tests\Tempest\Fixtures\Migrations\CreateChapterTable;
 use Tests\Tempest\Fixtures\Migrations\CreateIsbnTable;
 use Tests\Tempest\Fixtures\Migrations\CreatePublishersTable;
-use Tempest\Database\BelongsToMany;
-use Tempest\Database\IsDatabaseModel;
-use Tempest\Database\Table;
 use Tests\Tempest\Fixtures\Models\AWithEager;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\AuthorType;