Setting alias correctly when using ->as() in nested joins

Author: luisdalmolin

composer.json

@@ -25,8 +25,7 @@
     "require-dev": {
         "laravel/legacy-factories": "^1.0@dev",
         "orchestra/testbench": "4.*|5.*|6.*",
-        "phpunit/phpunit": "^8.0",
-        "spatie/laravel-ray": "dev-master"
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

src/Mixins/RelationshipsExtraMethods.php

@@ -81,7 +81,7 @@ protected function performJoinForEloquentPowerJoinsForBelongsToMany()
             [$alias1, $alias2] = $alias;
 
             $joinedTable = $alias1 ?: $this->getTable();
-            $parentTable = $this->getTableOrAliasForModel($this->parent)[1] ?? $this->parent->getTable();
+            $parentTable = $this->getTableOrAliasForModel($this->parent) ?? $this->parent->getTable();
 
             $builder->{$joinType}($this->getTable(), function ($join) use ($callback, $joinedTable, $parentTable, $alias1) {
                 if ($alias1) {

src/PowerJoinClause.php

@@ -58,6 +58,10 @@ public function as(string $alias)
         $this->table = sprintf('%s as %s', $this->table, $alias);
         $this->useTableAliasInConditions();
 
+        if ($this->model) {
+            PowerJoins::$powerJoinAliasesCache[spl_object_id($this->model)] = $alias;
+        }
+
         return $this;
     }
 

tests/JoinRelationshipUsingAliasTest.php

@@ -130,8 +130,8 @@ public function test_alias_for_belongs_to_many_nested()
         $user1->groups()->attach($group);
         $group->posts()->attach($post);
 
-        $users = User::query()->joinRelationshipUsingAlias('groups.posts')->get();
         $query = User::query()->joinRelationshipUsingAlias('groups.posts')->toSql();
+        $users = User::query()->joinRelationshipUsingAlias('groups.posts')->get();
 
         $this->assertCount(1, $users);
         $this->assertEquals($user1->id, $users->first()->id);