Merge pull request #97 from jonneroelofs/jr_fix_wheres_become_collection

Fixed using withTrashed and having an alias on a join clause

src/PowerJoinClause.php

@@ -119,7 +119,7 @@ protected function useTableAliasInConditions()
             }
 
             return $where;
-        });
+        })->toArray();
 
         return $this;
     }

tests/SoftDeletesTest.php

@@ -62,4 +62,31 @@ public function it_can_include_only_trashed()
             $query
         );
     }
+
+    /** @test */
+    public function it_can_disable_soft_deletes_when_using_an_alias()
+    {
+        // making sure the query doesn't fail
+        UserProfile::query()
+            ->joinRelationship('user', function ($join) {
+                $join->withTrashed();
+            })->get();
+
+        $query = UserProfile::query()
+            ->joinRelationship('user', function ($join) {
+                $join->as('myAlias');
+                $join->withTrashed();
+            })
+            ->toSql();
+
+        $this->assertStringContainsString(
+            'inner join "users" as "myAlias" on "user_profiles"."user_id" = "myAlias"."id"',
+            $query
+        );
+
+        $this->assertStringNotContainsString(
+            '"users"."deleted_at" is null',
+            $query
+        );
+    }
 }