handle soft delete enabeld first, force order by

samsonasik · samsonasik · commit 5a06e0e672f4 · 2020-05-01T02:43:18.000+07:00
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)

Original file line number	Diff line number	Diff line change
`@@ -473,9 +473,13 @@ public function first()`
`473`	`473`
`474`	`474`	`// Some databases, like PostgreSQL, need order`
`475`	`475`	`// information to consistently return correct results when there is group by`
`476`		`- if (! empty($this->QBGroupBy) && empty($builder->QBOrderBy) && ! empty($this->primaryKey))`
	`476`	`+ // except when soft delete is enabled`
	`477`	`+ if (empty($builder->QBOrderBy) && ! empty($this->primaryKey))`
`477`	`478`	`{`
`478`		`- $builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');`
	`479`	`+ if (! empty($this->QBGroupBy) \|\| $this->tempUseSoftDeletes === true)`
	`480`	`+ {`
	`481`	`+ $builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');`
	`482`	`+ }`
`479`	`483`	`}`
`480`	`484`
`481`	`485`	`$row = $builder->limit(1, 0)`