Fix alias not fully applying in has one/many through (#205)

* Fix alias not fully applying in has one/many through

* Fix tes

---------

Co-authored-by: Marick van Tuil <[email protected]>

Author: marickvantuil

src/JoinsHelper.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
+use Illuminate\Database\Eloquent\Relations\HasOneOrManyThrough;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use WeakMap;
 
@@ -172,6 +173,32 @@ public function getAliasName(bool $useAlias, Relation $relation, string $relatio
                 }
             }
 
+            if (is_array($callback) && $relation instanceof HasOneOrManyThrough) {
+                $alias = [null, null];
+
+                $throughParentTable = $relation->getThroughParent()->getTable();
+                if (isset($callback[$throughParentTable])) {
+                    $fakeJoinCallback = new FakeJoinCallback($relation->getBaseQuery(), 'inner', $throughParentTable);
+                    $callback[$throughParentTable]($fakeJoinCallback);
+
+                    if ($fakeJoinCallback->getAlias()) {
+                        $alias[0] = $fakeJoinCallback->getAlias();
+                    }
+                }
+
+                $farParentTable = $relation->getFarParent()->getTable();
+                if (isset($callback[$farParentTable])) {
+                    $fakeJoinCallback = new FakeJoinCallback($relation->getBaseQuery(), 'inner', $farParentTable);
+                    $callback[$farParentTable]($fakeJoinCallback);
+
+                    if ($fakeJoinCallback->getAlias()) {
+                        $alias[1] = $fakeJoinCallback->getAlias();
+                    }
+                }
+
+                return $alias;
+            }
+
             if (is_array($callback) && isset($callback[$tableName])) {
                 $fakeJoinCallback = new FakeJoinCallback($relation->getBaseQuery(), 'inner', $tableName);
                 $callback[$tableName]($fakeJoinCallback);

tests/JoinRelationshipUsingAliasTest.php

@@ -286,4 +286,53 @@ public function test_join_model_with_soft_deletes_using_alias()
         $this->assertQueryContains($expected, $queryB);
         $this->assertQueryContains($expected, $queryC);
     }
+
+    /** @test */
+    public function test_join_through_model_with_soft_deletes_using_alias()
+    {
+        // has one through
+        $query = Comment::query()->joinRelationship('postCategory', [
+            'postCategory' => [
+                'posts' => fn ($join) => $join->as('posts_alias'),
+            ],
+        ])->toSql();
+
+        $this->assertQueryContains(
+            $expected = 'select comments.* from comments inner join posts as posts_alias on posts_alias.id = comments.post_id and posts_alias.deleted_at is null inner join categories on categories.id = posts_alias.category_id',
+            $query
+        );
+
+        // has many through
+        $query = User::query()->joinRelationship('commentsThroughPosts', [
+            'comments' => fn ($join) => $join->as('comments_alias'),
+            'posts' => fn ($join) => $join->as('posts_alias'),
+        ])->toSql();
+
+        $this->assertQueryContains(
+            $expected = 'select "users".* from "users" inner join "posts" as "posts_alias" on "posts_alias"."user_id" = "users"."id" and "posts_alias"."deleted_at" is null inner join "comments" as "comments_alias" on "comments_alias"."post_id" = "posts_alias"."id" where "users"."deleted_at" is null',
+            $query
+        );
+
+        // ensure for nested relation too
+        $query = Post::query()->joinRelationship('lastComment.postCategory', [
+            'postCategory' => [
+                'posts' => fn ($join) => $join->as('posts_alias'),
+            ],
+        ])->toSql();
+
+        $this->assertQueryContains(
+            $expected = 'select "posts".* from "posts"',
+            $query
+        );
+
+        $this->assertQueryContains(
+            $expected = 'inner join "posts" as "posts_alias" on "posts_alias"."id" = "comments"."post_id" and "posts_alias"."deleted_at"',
+            $query
+        );
+
+        $this->assertQueryContains(
+            $expected = 'inner join "categories" on "categories"."id" = "posts_alias"."category_id"',
+            $query
+        );
+    }
 }