fix ambiguous calls

lekoala · Sep 23, 2021 · 95b1c00 · 95b1c00
1 parent d3bda91
commit 95b1c00
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/code/SoftDeleteSearchFilter.php b/code/SoftDeleteSearchFilter.php
@@ -1,5 +1,6 @@
 <?php
 
+use SilverStripe\ORM\DataObjectSchema;
 use SilverStripe\ORM\DataQuery;
 use SilverStripe\ORM\Filters\SearchFilter;
 
@@ -28,10 +29,12 @@ protected function getOnlyDeleted()
     protected function applyOne(DataQuery $query)
     {
         $this->model = $query->applyRelation($this->relation);
+        $schema = DataObjectSchema::singleton();
+        $tableName = $schema->tableName($this->model);
 
         $query = $query->setQueryParam("SoftDeletable.filter", false);
         if ($this->getOnlyDeleted() || $this->name == "OnlyDeleted") {
-            $query = $query->where("Deleted IS NOT NULL");
+            $query = $query->where("\"$tableName\".\"Deleted\" IS NOT NULL");
         }
 
         return $query;
@@ -40,10 +43,12 @@ protected function applyOne(DataQuery $query)
     protected function applyMany(DataQuery $query)
     {
         $this->model = $query->applyRelation($this->relation);
+        $schema = DataObjectSchema::singleton();
+        $tableName = $schema->tableName($this->model);
 
         $query = $query->setQueryParam("SoftDeletable.filter", false);
         if ($this->getOnlyDeleted() || $this->name == "OnlyDeleted") {
-            $query = $query->where("Deleted IS NOT NULL");
+            $query = $query->where("\"$tableName\".\"Deleted\" IS NOT NULL");
         }
 
         return $query;
@@ -52,10 +57,12 @@ protected function applyMany(DataQuery $query)
     protected function excludeOne(DataQuery $query)
     {
         $this->model = $query->applyRelation($this->relation);
+        $schema = DataObjectSchema::singleton();
+        $tableName = $schema->tableName($this->model);
 
         $query = $query->setQueryParam("SoftDeletable.filter", true);
         if ($this->getOnlyDeleted() || $this->name == "OnlyDeleted") {
-            $query = $query->where("Deleted IS NULL");
+            $query = $query->where("\"$tableName\".\"Deleted\" IS NULL");
         }
 
         return $query;
@@ -64,10 +71,12 @@ protected function excludeOne(DataQuery $query)
     protected function excludeMany(DataQuery $query)
     {
         $this->model = $query->applyRelation($this->relation);
+        $schema = DataObjectSchema::singleton();
+        $tableName = $schema->tableName($this->model);
 
         $query = $query->setQueryParam("SoftDeletable.filter", true);
         if ($this->getOnlyDeleted() || $this->name == "OnlyDeleted") {
-            $query = $query->where("Deleted IS NULL");
+            $query = $query->where("\"$tableName\".\"Deleted\" IS NULL");
         }
 
         return $query;