use fully qualified column name

ddzobov · Mar 15, 2020 · 2a6c296 · 2a6c296
1 parent f564198
commit 2a6c296
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Relations/BelongsToManySoft.php b/src/Relations/BelongsToManySoft.php
@@ -47,7 +47,7 @@ public function deletedAt()
      */
     public function getQualifiedDeletedAtColumnName()
     {
-        return $this->getQualifiedColumnName($this->pivotDeletedAt);
+        return $this->getQualifiedColumnName($this->deletedAt());
     }
 
     /**

diff --git a/src/Relations/Concerns/InteractsWithPivotTable.php b/src/Relations/Concerns/InteractsWithPivotTable.php
@@ -208,7 +208,7 @@ protected function getCurrentlyAttachedPivots()
     protected function newPivotQueryWithoutTrashed()
     {
         return $this->newPivotQuery()->when($this->withSoftDeletes, function (Builder $query) {
-            $query->whereNull($this->deletedAt());
+            $query->whereNull($this->getQualifiedDeletedAtColumnName());
         });
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ public function deletedAt() @@
          */
         public function getQualifiedDeletedAtColumnName()
         {
-            return $this->getQualifiedColumnName($this->pivotDeletedAt);
+            return $this->getQualifiedColumnName($this->deletedAt());
         }
         /**
@@ Expand Down @@