Fixed morph relationships using alias

Author: luisdalmolin

src/Mixins/RelationshipsExtraMethods.php

@@ -141,7 +141,7 @@ protected function performJoinForEloquentPowerJoinsForMorph()
                     "{$this->getModel()->getTable()}.{$this->getForeignKeyName()}",
                     '=',
                     "{$this->parent->getTable()}.{$this->localKey}"
-                )->where($this->getMorphType(), '=', $this->getMorphClass());
+                )->where("{$this->getModel()->getTable()}.{$this->getMorphType()}", '=', $this->getMorphClass());
 
                 if ($disableExtraConditions === false && $this->usesSoftDeletes($this->query->getModel())) {
                     $join->whereNull($this->query->getModel()->getQualifiedDeletedAtColumn());

src/PowerJoinClause.php

@@ -107,30 +107,56 @@ protected function useTableAliasInConditions(): self
         }
 
         $this->wheres = collect($this->wheres)->filter(function ($where) {
-            return in_array($where['type'] ?? '', ['Column']);
+            return in_array($where['type'] ?? '', ['Column', 'Basic']);
         })->map(function ($where) {
-            // dd($where);
             $key = $this->model->getKeyName();
             $table = $this->tableName;
+            $replaceMethod = sprintf('useAliasInWhere%sType', ucfirst($where['type']));
 
-            // if it was already replaced, skip
-            if (Str::startsWith($where['first'] . '.', $this->alias . '.') || Str::startsWith($where['second'] . '.', $this->alias . '.')) {
-                return $where;
-            }
+            return $this->{$replaceMethod}($where);
+        })->toArray();
 
-            if (Str::contains($where['first'], $table) && Str::contains($where['second'], $table)) {
-                // if joining the same table, only replace the correct table.key pair
-                $where['first'] = str_replace($table . '.' . $key, $this->alias . '.' . $key, $where['first']);
-                $where['second'] = str_replace($table . '.' . $key, $this->alias . '.' . $key, $where['second']);
-            } else {
-                $where['first'] = str_replace($table . '.', $this->alias . '.', $where['first']);
-                $where['second'] = str_replace($table . '.', $this->alias . '.', $where['second']);
-            }
+        return $this;
+    }
 
+    protected function useAliasInWhereColumnType(array $where): array
+    {
+        $key = $this->model->getKeyName();
+        $table = $this->tableName;
+
+        // if it was already replaced, skip
+        if (Str::startsWith($where['first'] . '.', $this->alias . '.') || Str::startsWith($where['second'] . '.', $this->alias . '.')) {
             return $where;
-        })->toArray();
+        }
 
-        return $this;
+        if (Str::contains($where['first'], $table) && Str::contains($where['second'], $table)) {
+            // if joining the same table, only replace the correct table.key pair
+            $where['first'] = str_replace($table . '.' . $key, $this->alias . '.' . $key, $where['first']);
+            $where['second'] = str_replace($table . '.' . $key, $this->alias . '.' . $key, $where['second']);
+        } else {
+            $where['first'] = str_replace($table . '.', $this->alias . '.', $where['first']);
+            $where['second'] = str_replace($table . '.', $this->alias . '.', $where['second']);
+        }
+
+        return $where;
+    }
+
+    protected function useAliasInWhereBasicType(array $where): array
+    {
+        $table = $this->tableName;
+
+        if (Str::startsWith($where['column'] . '.', $this->alias . '.')) {
+            return $where;
+        }
+
+        if (Str::contains($where['column'], $table)) {
+            // if joining the same table, only replace the correct table.key pair
+            $where['column'] = str_replace($table . '.', $this->alias . '.', $where['column']);
+        } else {
+            $where['column'] = str_replace($table . '.', $this->alias . '.', $where['column']);
+        }
+
+        return $where;
     }
 
     public function whereNull($columns, $boolean = 'and', $not = false)

tests/JoinRelationshipExtraConditionsTest.php

@@ -179,7 +179,7 @@ public function test_extra_conditions_in_morph_many()
         $this->assertCount(1, $posts);
 
         $this->assertStringContainsString(
-            'inner join "images" on "images"."imageable_id" = "posts"."id" and "imageable_type" = ? and "cover" = ?',
+            'inner join "images" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ? and "cover" = ?',
             $query
         );
     }

tests/JoinRelationshipTest.php

@@ -103,7 +103,7 @@ public function test_join_morph_relationship()
 
         $this->assertCount(5, $posts);
         $this->assertStringContainsString(
-            'inner join "images" on "images"."imageable_id" = "posts"."id" and "imageable_type" = ?',
+            'inner join "images" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ?',
             $query
         );
     }
@@ -119,7 +119,7 @@ public function test_join_morph_nested_relationship()
         );
 
         $this->assertStringContainsString(
-            'inner join "images" on "images"."imageable_id" = "posts"."id" and "imageable_type" = ?',
+            'inner join "images" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ?',
             $query
         );
     }
@@ -303,7 +303,7 @@ public function test_it_doesnt_join_the_same_relationship_twice_with_nested()
         );
 
         $this->assertStringContainsString(
-            'inner join "images" on "images"."imageable_id" = "posts"."id" and "imageable_type" = ?',
+            'inner join "images" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ?',
             $query
         );
     }
@@ -353,7 +353,7 @@ public function test_it_doesnt_join_the_same_relationship_twice_with_complex_nes
         );
 
         $this->assertStringContainsString(
-            'left join "images" on "images"."imageable_id" = "posts"."id" and "imageable_type" = ?',
+            'left join "images" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ?',
             $query
         );
 

tests/JoinRelationshipUsingAliasTest.php

@@ -248,4 +248,23 @@ public function test_joining_deep_many_to_many_relation_using_same_base_table()
         $sql = $query->toSql();
         $this->assertStringContainsString('inner join "posts" as "post_alias" on "post_alias"."id" = "post_groups_alias"."post_id"', $sql);
     }
+
+    /** @test */
+    public function test_morph_join_using_alias()
+    {
+        $query = Post::query()
+            ->with(['images'])
+            ->joinRelationshipUsingAlias('images', 'foo')
+            ->toSql();
+
+        Post::query()
+            ->with(['images'])
+            ->joinRelationshipUsingAlias('images', 'foo')
+            ->get();
+
+        $this->assertStringContainsString(
+            'inner join "images" as "foo" on "foo"."imageable_id" = "posts"."id" and "foo"."imageable_type" = ?',
+            $query
+        );
+    }
 }