Add table prefixes for deleted_at fields

codeigniter4 · Jun 12, 2019 · ee0f8fe · ee0f8fe
1 parent ad20714
commit ee0f8fe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/system/Model.php b/system/Model.php
@@ -947,8 +947,8 @@ public function purgeDeleted()
 		}
 
 		return $this->builder()
-						->where($this->deletedField . ' IS NOT NULL')
-						->delete();
+			    ->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
+			    ->delete();
 	}
 
 	//--------------------------------------------------------------------
@@ -981,7 +981,7 @@ public function onlyDeleted()
 		$this->tempUseSoftDeletes = false;
 
 		$this->builder()
-				->where($this->deletedField . ' IS NOT NULL');
+		     ->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
 
 		return $this;
 	}
@@ -1543,7 +1543,7 @@ public function countAllResults(bool $reset = true, bool $test = false)
 	{
 		if ($this->tempUseSoftDeletes === true)
 		{
-			$this->builder()->where($this->deletedField, null);
+			$this->builder()->where($this->table . '.' . $this->deletedField, null);
 		}
 
 		return $this->builder()->countAllResults($reset, $test);