Issue 160: Avoid calling internal methods with null (#164)

* Fixes to avoid passing null values to qualiyColumn method

* Fixed test

* Removed debug code

Author: luisdalmolin

src/Mixins/RelationshipsExtraMethods.php

@@ -2,6 +2,8 @@
 
 namespace Kirschbaum\PowerJoins\Mixins;
 
+use Stringable;
+use Illuminate\Support\Str;
 use Kirschbaum\PowerJoins\StaticCache;
 use Kirschbaum\PowerJoins\PowerJoinClause;
 use Kirschbaum\PowerJoins\Tests\Models\Post;
@@ -256,8 +258,8 @@ protected function performJoinForEloquentPowerJoinsForMorphTo()
                     "{$modelInstance->getTable()}.{$modelInstance->getKeyName()}"
                 )->where("{$this->getModel()->getTable()}.{$this->getMorphType()}", '=', $modelInstance->getMorphClass());
 
-                if ($disableExtraConditions === false && $this->usesSoftDeletes($this->query->getModel())) {
-                    $join->whereNull($this->query->getModel()->getQualifiedDeletedAtColumn());
+                if ($disableExtraConditions === false && $this->usesSoftDeletes($modelInstance)) {
+                    $join->whereNull($modelInstance->getQualifiedDeletedAtColumn());
                 }
 
                 if ($disableExtraConditions === false) {
@@ -267,7 +269,7 @@ protected function performJoinForEloquentPowerJoinsForMorphTo()
                 if ($callback && is_callable($callback)) {
                     $callback($join);
                 }
-            }, $this->getModel());
+            }, $modelInstance);
 
             return $this;
         };
@@ -485,7 +487,13 @@ public function applyNestedCondition()
     public function shouldNotApplyExtraCondition()
     {
         return function ($condition) {
-            $key = $this->getPowerJoinExistenceCompareKey();
+            if (isset($condition['column']) && Str::endsWith($condition['column'], '.')) {
+                return true;
+            }
+
+            if (! $key = $this->getPowerJoinExistenceCompareKey()) {
+                return true;
+            }
 
             if (isset($condition['query'])) {
                 return false;
@@ -502,6 +510,10 @@ public function shouldNotApplyExtraCondition()
     public function getPowerJoinExistenceCompareKey()
     {
         return function () {
+            if ($this instanceof MorphTo) {
+                return [$this->getMorphType(), $this->getForeignKeyName()];
+            }
+
             if ($this instanceof BelongsTo) {
                 return $this->getQualifiedOwnerKeyName();
             }

src/PowerJoinClause.php

@@ -9,6 +9,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class PowerJoinClause extends JoinClause
 {
@@ -96,6 +97,10 @@ public function withGlobalScopes(): self
                 continue;
             }
 
+            if ($scope instanceof SoftDeletingScope) {
+                continue;
+            }
+
             (new $scope())->apply($this, $this->model);
         }
 

tests/JoinRelationshipExtraConditionsTest.php

@@ -141,7 +141,7 @@ public function test_extra_conditions_with_belongs_to_many()
         $this->assertCount(1, Group::joinRelationship('publishedPosts')->get());
 
         $this->assertStringContainsString(
-            'inner join "posts" on "posts"."id" = "post_groups"."post_id" and "posts"."published" = ?',
+            'inner join "posts" on "posts"."id" = "post_groups"."post_id" and "posts"."deleted_at" is null and "posts"."published" = ?',
             Group::joinRelationship('publishedPosts')->toSql()
         );
     }
@@ -163,7 +163,7 @@ public function test_extra_conditions_in_pivot_with_belongs_to_many_in()
         $this->assertCount(2, Group::joinRelationship('recentPosts')->get());
 
         $this->assertStringContainsString(
-            'inner join "posts" on "posts"."id" = "post_groups"."post_id" and "post_groups"."assigned_at" >= ?',
+            'inner join "posts" on "posts"."id" = "post_groups"."post_id" and "posts"."deleted_at" is null and "post_groups"."assigned_at" >= ?',
             Group::joinRelationship('recentPosts')->toSql()
         );
     }
@@ -238,7 +238,7 @@ public function test_extra_conditions_with_closure()
         User::joinRelationship('publishedOrReviewedPosts')->get();
 
         $this->assertStringContainsString(
-            'inner join "posts" on "posts"."user_id" = "users"."id" and ("published" = ? or "reviewed" = ?)',
+            'inner join "posts" on "posts"."user_id" = "users"."id" and "posts"."deleted_at" is null and ("published" = ? or "reviewed" = ?)',
             $query
         );
     }

tests/JoinRelationshipTest.php

@@ -700,7 +700,7 @@ public function test_scope_inside_nested_where()
         })->toSql();
 
         $this->assertStringContainsString(
-            'inner join "posts" on "comments"."post_id" = "posts"."id" and ("posts"."published" = ?)',
+            'inner join "posts" on "comments"."post_id" = "posts"."id" and "posts"."deleted_at" is null and ("posts"."published" = ?)',
             $sql
         );
     }
@@ -798,9 +798,16 @@ public function test_it_doesnt_fail_to_join_the_same_query_repeatedly()
 
     public function test_join_morph_to_morphable_class()
     {
-        factory(Image::class, 5)->state('owner:post')->create();
+        $publishedPost = factory(Post::class)->state('published')->create();
+        $unpublishedPost = factory(Post::class)->state('unpublished')->create();
+        factory(Image::class, 3)->state('owner:post')->create(['imageable_id' => $unpublishedPost->id]);
+        factory(Image::class, 2)->state('owner:post')->create(['imageable_id' => $publishedPost->id]);
         factory(Image::class, 4)->state('owner:user')->create();
 
+        $publishedPostImages = Image::query()
+            ->joinRelationship('imageable', callback: fn ($join) => $join->published(), morphable: Post::class)
+            ->get();
+
         $postImages = Image::query()
             ->joinRelationship('imageable', morphable: Post::class)
             ->get();
@@ -810,10 +817,11 @@ public function test_join_morph_to_morphable_class()
             ->toSql();
 
         $this->assertStringContainsString(
-            'inner join "posts" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ?',
+            'inner join "posts" on "images"."imageable_id" = "posts"."id" and "images"."imageable_type" = ? and "posts"."deleted_at" is null',
             $sql
         );
 
         $this->assertCount(5, $postImages);
+        $this->assertCount(2, $publishedPostImages);
     }
 }

tests/Models/Post.php

@@ -10,10 +10,12 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Post extends Model
 {
     use PowerJoins;
+    use SoftDeletes;
 
     /** @var string */
     protected $table = 'posts';

tests/database/migrations/2020_03_16_000000_create_tables.php

@@ -54,6 +54,7 @@ public function up()
             $table->boolean('reviewed')->default(true);
             $table->boolean('published')->default(true);
             $table->timestamps();
+            $table->softDeletes();
         });
 
         Schema::create('post_groups', function (Blueprint $table) {
@@ -84,6 +85,7 @@ public function up()
             $table->morphs('imageable');
             $table->boolean('cover')->default(false);
             $table->timestamps();
+            $table->softDeletes();
         });
 
         Schema::create('tags', function (Blueprint $table) {