fix: include soft delete conditions when using named aliases (#204)

* add failing test case

* do not skip soft delete wheres when using alias

* fix tests

* linter

Author: luisvdbk

src/PowerJoinClause.php

@@ -111,8 +111,22 @@ protected function useTableAliasInConditions(): self
         }
 
         $this->wheres = collect($this->wheres)->filter(function ($where) {
-            return in_array($where['type'] ?? '', ['Column', 'Basic'], true);
+            $whereType = $where['type'] ?? '';
+
+            if (in_array($whereType, ['Column', 'Basic'], true)) {
+                return true;
+            }
+
+            if ($whereType === 'Null' && Str::contains($where['column'], $this->getModel()->getDeletedAtColumn())) {
+                return true;
+            }
+
+            return false;
         })->map(function ($where) {
+            if ($where['type'] === 'Null') {
+                return $where;
+            }
+
             $key = $this->model->getKeyName();
             $table = $this->tableName;
             $replaceMethod = sprintf('useAliasInWhere%sType', ucfirst($where['type']));

tests/JoinRelationshipTest.php

@@ -793,7 +793,7 @@ public function test_it_can_alias_belongs_to_many()
         );
 
         $this->assertQueryContains(
-            'inner join "posts" as "posts_1" on "posts_1"."id" = "pivot_posts_1"."post_id" and "posts_1"."id" = ?',
+            'inner join "posts" as "posts_1" on "posts_1"."id" = "pivot_posts_1"."post_id" and "posts_1"."deleted_at" is null and "posts_1"."id" = ?',
             $sql
         );
     }

tests/JoinRelationshipUsingAliasTest.php

@@ -2,6 +2,7 @@
 
 namespace Kirschbaum\PowerJoins\Tests;
 
+use Kirschbaum\PowerJoins\PowerJoinClause;
 use Kirschbaum\PowerJoins\Tests\Models\Category;
 use Kirschbaum\PowerJoins\Tests\Models\Comment;
 use Kirschbaum\PowerJoins\Tests\Models\Group;
@@ -267,4 +268,22 @@ public function test_morph_join_using_alias()
             $query
         );
     }
+
+    /** @test */
+    public function test_join_model_with_soft_deletes_using_alias()
+    {
+        $queryA = UserProfile::query()->joinRelationshipUsingAlias('user', 'user_alias')->toSql();
+        $queryB = UserProfile::query()->joinRelationship('user', 'user_alias')->toSql();
+        $queryC = UserProfile::query()->joinRelationship(
+            'user',
+            fn (PowerJoinClause $join) => $join->as('user_alias')
+        )->toSql();
+
+        $this->assertQueryContains(
+            $expected = 'inner join "users" as "user_alias" on "user_profiles"."user_id" = "user_alias"."id" and "user_alias"."deleted_at" is null',
+            $queryA
+        );
+        $this->assertQueryContains($expected, $queryB);
+        $this->assertQueryContains($expected, $queryC);
+    }
 }

tests/OrderByTest.php

@@ -209,7 +209,7 @@ public function test_order_by_relationship_with_relationship_alias()
         ]);
 
         $this->assertQueryContains(
-            'select "users".* from "users" inner join "posts" as "posts_alias" on "posts_alias"."user_id" = "users"."id" inner join "categories" as "category_alias" on "posts_alias"."category_id" = "category_alias"."id" where "users"."deleted_at" is null order by "category_alias"."title" desc',
+            'select "users".* from "users" inner join "posts" as "posts_alias" on "posts_alias"."user_id" = "users"."id" and "posts_alias"."deleted_at" is null inner join "categories" as "category_alias" on "posts_alias"."category_id" = "category_alias"."id" where "users"."deleted_at" is null order by "category_alias"."title" desc',
             $query->toSql()
         );