Fix nested many to many alias, allow callbacks using the full relation name (#127)

* Fix many to many nested

* check with dots if is already replaced

---------

Co-authored-by: Alex Osendi <[email protected]>

Author: Runig006

src/PowerJoinClause.php

@@ -114,7 +114,7 @@ protected function useTableAliasInConditions(): self
             $table = $this->tableName;
 
             // if it was already replaced, skip
-            if (Str::startsWith($where['first'] . '.', $this->alias) || Str::startsWith($where['second'] . '.', $this->alias)) {
+            if (Str::startsWith($where['first'] . '.', $this->alias . '.') || Str::startsWith($where['second'] . '.', $this->alias . '.')) {
                 return $where;
             }
 

src/PowerJoins.php

@@ -44,7 +44,6 @@ public function scopeJoinRelationship(Builder $query, $relationName, $callback =
 
         if (Str::contains($relationName, '.')) {
             $query->joinNestedRelationship($relationName, $callback, $joinType, $useAlias, $disableExtraConditions);
-
             return;
         }
 
@@ -138,7 +137,11 @@ public function scopeJoinNestedRelationship(Builder $query, string $relationship
         /** @var \Illuminate\Database\Eloquent\Relations\Relation */
         $latestRelation = null;
 
+        $part = [];
         foreach ($relations as $relationName) {
+            $part[] = $relationName;
+            $fullRelationName = join(".", $part);
+            
             $currentModel = $latestRelation ? $latestRelation->getModel() : $query->getModel();
             $relation = $currentModel->{$relationName}();
             $relationCallback = null;
@@ -147,7 +150,16 @@ public function scopeJoinNestedRelationship(Builder $query, string $relationship
                 $relationCallback = $callback[$relationName];
             }
 
+            if ($callback && is_array($callback) && isset($callback[$fullRelationName])) {
+                $relationCallback = $callback[$fullRelationName];
+            }
+
             $alias = $this->getAliasName($useAlias, $relation, $relationName, $relation->getQuery()->getModel()->getTable(), $relationCallback);
+            if ($alias && $relation instanceof BelongsToMany && ! is_array($alias)) {
+                $extraAlias = $this->getAliasName($useAlias, $relation, $relationName, $relation->getTable(), $relationCallback);
+                $alias = [$extraAlias, $alias];
+            }
+
             $aliasString = is_array($alias) ? implode('.', $alias) : $alias;
             $useAlias = $alias ? true : $useAlias;
 

tests/JoinRelationshipUsingAliasTest.php

@@ -227,4 +227,25 @@ public function test_joining_deep_relation_using_same_base_table()
 
         $this->assertStringContainsString('inner join "categories" as "categories_alias" on "post_alias"."category_id" = "categories_alias"."id"', $sql);
     }
+
+    /** @test */
+    public function test_joining_deep_many_to_many_relation_using_same_base_table()
+    {
+        $alias = [
+            'groups' => function ($join) {
+                $join->as('groups_alias');
+            },
+            'posts' => [
+                'post_groups' => function ($join) {
+                    $join->as('post_groups_alias');
+                },
+                'posts' => function ($join) {
+                    $join->as('post_alias');
+                },
+            ]
+        ];
+        $query = User::joinRelationship('groups', $alias)->joinRelationship('groups.posts', $alias);
+        $sql = $query->toSql();
+        $this->assertStringContainsString('inner join "posts" as "post_alias" on "post_alias"."id" = "post_groups_alias"."post_id"', $sql);
+    }
 }