Merge pull request #33 from kirschbaum-development/issue-31

Fixed the ability to pass nested closures in join callbacks when using aliases

Author: luisdalmolin

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All notable changes to `eloquent-power-joins` will be documented in this file.
 
+## 2.2.2 - 2020-10
+- Fixed the ability to pass nested closures in join callbacks when using aliases;
+
 ## 2.2.1 - 2020-10
 - Fixed nested conditions in relationship definitions;
 

src/PowerJoinClause.php

@@ -115,7 +115,7 @@ public function whereNull($columns, $boolean = 'and', $not = false)
 
     public function where($column, $operator = null, $value = null, $boolean = 'and')
     {
-        if ($this->alias && Str::contains($column, $this->tableName)) {
+        if ($this->alias && is_string($column) && Str::contains($column, $this->tableName)) {
             $column = str_replace("{$this->tableName}.", "{$this->alias}.", $column);
         }
 

tests/JoinRelationshipTest.php

@@ -397,4 +397,27 @@ public function test_it_joins_different_tables_with_same_relationship_name()
             $query
         );
     }
+
+    /** @test */
+    public function test_passing_where_closure_inside_join_callback()
+    {
+        $query = Post::query()
+            ->joinRelationship('category', function ($join) {
+                $join->as('category_alias')
+                    ->where(function ($query) {
+                        $query->whereNull('category_alias.parent_id')
+                            ->orWhere('category_alias.parent_id', 3);
+                    });
+            });
+
+        $sql = $query->toSql();
+
+        // executing to make sure it does not throw exceptions
+        $query->get();
+
+        $this->assertStringContainsString(
+            'inner join "categories" as "category_alias" on "posts"."category_id" = "category_alias"."id" and ("category_alias"."parent_id" is null or "category_alias"."parent_id" = ?)',
+            $sql
+        );
+    }
 }