handle soft delete enabeld first, force order by

codeigniter4 · Apr 30, 2020 · 5a06e0e · 5a06e0e
1 parent 1a00d45
commit 5a06e0e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/system/Model.php b/system/Model.php
@@ -473,9 +473,13 @@ public function first()
 
 		// Some databases, like PostgreSQL, need order
 		// information to consistently return correct results when there is group by
-		if (! empty($this->QBGroupBy) && empty($builder->QBOrderBy) && ! empty($this->primaryKey))
+		// except when soft delete is enabled
+		if (empty($builder->QBOrderBy) && ! empty($this->primaryKey))
 		{
-			$builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
+			if (! empty($this->QBGroupBy) || $this->tempUseSoftDeletes === true)
+			{
+				$builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
+			}
 		}
 
 		$row = $builder->limit(1, 0)