Merge pull request #57 from kirschbaum-development/issue-53

Fix #53
kirschbaum-development · Aug 30, 2021 · 4c5c1c4 · 4c5c1c4
2 parents a2ba04a + ed938b3
commit 4c5c1c4
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,15 +9,13 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                php: [7.3, 7.4]
-                laravel: [6.*, 7.*, 8.*]
+                php: [7.4]
+                laravel: [7.*, 8.*]
                 include:
                     -   laravel: 8.*
                         testbench: 6.*
                     -   laravel: 7.*
                         testbench: 5.*
-                    -   laravel: 6.*
-                        testbench: 4.*
 
         name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

diff --git a/src/Mixins/RelationshipsExtraMethods.php b/src/Mixins/RelationshipsExtraMethods.php
@@ -12,6 +12,9 @@
 use Kirschbaum\PowerJoins\PowerJoinClause;
 use Kirschbaum\PowerJoins\PowerJoins;
 
+/**
+ * @method getModel
+ */
 class RelationshipsExtraMethods
 {
     /**
@@ -78,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) {
@@ -224,6 +227,10 @@ protected function performJoinForEloquentPowerJoinsForHasManyThrough()
                 if (is_array($callback) && isset($callback[$this->getThroughParent()->getTable()])) {
                     $callback[$this->getThroughParent()->getTable()]($join);
                 }
+
+                if ($callback && is_callable($callback)) {
+                    $callback($join);
+                }
             }, $this->getThroughParent());
 
             $builder->{$joinType}($this->getModel()->getTable(), function (PowerJoinClause $join) use ($callback, $throughTable, $farTable, $alias1, $alias2) {

diff --git a/src/PowerJoinClause.php b/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;
     }
 

diff --git a/tests/JoinRelationshipTest.php b/tests/JoinRelationshipTest.php
@@ -320,7 +320,16 @@ public function test_it_doesnt_join_the_same_relationship_twice_with_complex_nes
             ->toSql();
 
         // making sure it doesn't throw any errors
-        User::query()->select('users.*')->joinRelationship('posts.comments')->joinRelationship('posts.images')->get();
+        User::query()
+            ->select('users.*')
+            ->leftJoinRelationship('posts.comments')
+            ->leftJoinRelationship('posts.images')
+            ->leftJoinRelationship('posts.category')
+            ->leftJoinRelationship('posts.category.parent', [
+                'parent' => function ($join) {
+                    $join->as('category_parent');
+                },
+            ])->get();
 
         $this->assertStringContainsString(
             'left join "posts" on "posts"."user_id" = "users"."id"',
@@ -555,4 +564,16 @@ public function test_passing_where_closure_inside_join_callback()
             $sql
         );
     }
+
+    /** @test */
+    public function test_nested_join_with_aliases()
+    {
+        $query = Post::query()
+            ->where('posts.id', '>', 10)
+            ->joinRelationship('category.parent', [
+                'category' => fn ($join) => $join->as('category_alias'),
+                'parent' => fn ($join) => $join->as('parent_alias'),
+            ])
+            ->get();
+    }
 }
diff --git a/tests/JoinRelationshipUsingAliasTest.php b/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);