Correct 'through' relation alias, add missing alias to morph relations (#210)

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

Author: marickvantuil

src/JoinsHelper.php

@@ -188,10 +188,10 @@ public function getAliasName(bool $useAlias, Relation $relation, string $relatio
                     }
                 }
 
-                $farParentTable = $relation->getFarParent()->getTable();
-                if (isset($callback[$farParentTable])) {
-                    $fakeJoinCallback = new FakeJoinCallback($relation->getBaseQuery(), 'inner', $farParentTable);
-                    $callback[$farParentTable]($fakeJoinCallback);
+                $relatedTable = $relation->getRelated()->getTable();
+                if (isset($callback[$relatedTable])) {
+                    $fakeJoinCallback = new FakeJoinCallback($relation->getBaseQuery(), 'inner', $relatedTable);
+                    $callback[$relatedTable]($fakeJoinCallback);
 
                     if ($fakeJoinCallback->getAlias()) {
                         $alias[1] = $fakeJoinCallback->getAlias();

src/Mixins/RelationshipsExtraMethods.php

@@ -223,7 +223,11 @@ protected function performJoinForEloquentPowerJoinsForMorphToMany()
     protected function performJoinForEloquentPowerJoinsForMorph()
     {
         return function ($builder, $joinType, $callback = null, $alias = null, bool $disableExtraConditions = false) {
-            $builder->{$joinType}($this->getModel()->getTable(), function ($join) use ($callback, $disableExtraConditions) {
+            $builder->{$joinType}($this->getModel()->getTable(), function ($join) use ($callback, $disableExtraConditions, $alias) {
+                if ($alias) {
+                    $join->as($alias);
+                }
+
                 $join->on(
                     "{$this->getModel()->getTable()}.{$this->getForeignKeyName()}",
                     '=',

tests/JoinRelationshipUsingAliasTest.php

@@ -267,6 +267,12 @@ public function test_morph_join_using_alias()
             'inner join "images" as "foo" on "foo"."imageable_id" = "posts"."id" and "foo"."imageable_type" = ?',
             $query
         );
+
+        $query = Post::query()
+            ->joinRelationship('likes', fn ($join) => $join->as('foo'))
+            ->toSql();
+
+        $this->assertQueryContains('inner join likes as foo on foo.likeable_id = posts.id and foo.likeable_type = ? and foo.deleted_at is null', $query);
     }
 
     /** @test */
@@ -302,6 +308,16 @@ public function test_join_through_model_with_soft_deletes_using_alias()
             $query
         );
 
+        // has one through - alias on related
+        $query = User::query()->joinRelationship('postsThroughComments', [
+            'posts' => fn ($join) => $join->as('post_alias'),
+        ])->toSql();
+
+        $this->assertQueryContains(
+            $expected = 'select users.* from users inner join comments on comments.user_id = users.id inner join posts as post_alias on post_alias.comment_id = comments.id and post_alias.deleted_at is null where users.deleted_at is null',
+            $query
+        );
+
         // has many through
         $query = User::query()->joinRelationship('commentsThroughPosts', [
             'comments' => fn ($join) => $join->as('comments_alias'),

tests/Models/Like.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Kirschbaum\PowerJoins\Tests\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Like extends Model
+{
+    use SoftDeletes;
+    /** @var string */
+    protected $table = 'likes';
+
+    public function likeable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+}

tests/Models/Post.php

@@ -57,6 +57,11 @@ public function images(): MorphMany
         return $this->morphMany(Image::class, 'imageable');
     }
 
+    public function likes(): MorphMany
+    {
+        return $this->morphMany(Like::class, 'likeable');
+    }
+
     public function coverImages(): MorphMany
     {
         return $this->morphMany(Image::class, 'imageable')->where('cover', true);

tests/Models/User.php

@@ -68,6 +68,11 @@ public function commentsThroughPosts(): HasManyThrough
         return $this->hasManyThrough(Comment::class, Post::class);
     }
 
+    public function postsThroughComments(): HasManyThrough
+    {
+        return $this->hasManyThrough(Post::class, Comment::class);
+    }
+
     public function images(): MorphMany
     {
         return $this->morphMany(Image::class, 'imageable');

tests/database/migrations/2020_03_16_000000_create_tables.php

@@ -94,6 +94,13 @@ public function up()
             $table->softDeletes();
         });
 
+        Schema::create('likes', function (Blueprint $table) {
+            $table->increments('id');
+            $table->morphs('likeable');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
         Schema::create('tags', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');