Merge pull request #76 from jonneroelofs/master

added check to see if the used alias should be custom or user provided

Author: luisdalmolin

src/PowerJoins.php

@@ -40,6 +40,7 @@ trait PowerJoins
     public function scopeJoinRelationship(Builder $query, $relationName, $callback = null, $joinType = 'join', $useAlias = false, bool $disableExtraConditions = false): void
     {
         $joinType = PowerJoins::$joinMethodsMap[$joinType] ?? $joinType;
+        $useAlias = is_string($callback) ? false : $useAlias;
         $callback = $this->formatJoinCallback($relationName, $callback);
 
         if (is_null($query->getSelect())) {

tests/JoinRelationshipUsingAliasTest.php

@@ -24,6 +24,19 @@ public function test_joining_using_auto_generated_alias()
         $this->assertCount(1, $posts);
     }
 
+    /**
+     * @test
+     */
+    public function test_joining_using_provided_alias()
+    {
+        $category = factory(Category::class)->state('with:parent')->create();
+        $post = factory(Post::class)->create(['category_id' => $category->id]);
+
+        $sql = Post::joinRelationshipUsingAlias('category', 'my_alias')->toSql();
+
+        $this->assertStringContainsString('my_alias', $sql);
+    }
+
     /**
      * @test
      */