fix: getWhere(), update(), delete() and $limit=0

codeigniter4 · Dec 12, 2023 · 20ea393 · 20ea393
1 parent 05645ce
commit 20ea393
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/phpstan-baseline.php b/phpstan-baseline.php
@@ -833,7 +833,7 @@
 ];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
-	'count' => 40,
+	'count' => 37,
 	'path' => __DIR__ . '/system/Database/BaseBuilder.php',
 ];
 $ignoreErrors[] = [

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1747,7 +1747,11 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
             $this->where($where);
         }
 
-        if (! empty($limit)) {
+        if (config(Feature::class)->limitZeroAsAll && $limit === 0) {
+            $limit = null;
+        }
+
+        if ($limit !== null) {
             $this->limit($limit, $offset);
         }
 
@@ -2463,7 +2467,11 @@ public function update($set = null, $where = null, ?int $limit = null): bool
             $this->where($where);
         }
 
-        if (! empty($limit)) {
+        if (config(Feature::class)->limitZeroAsAll && $limit === 0) {
+            $limit = null;
+        }
+
+        if ($limit !== null) {
             if (! $this->canLimitWhereUpdates) {
                 throw new DatabaseException('This driver does not allow LIMITs on UPDATE queries using WHERE.');
             }
@@ -2780,7 +2788,11 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
 
         $sql = $this->_delete($this->removeAlias($table));
 
-        if (! empty($limit)) {
+        if (config(Feature::class)->limitZeroAsAll && $limit === 0) {
+            $limit = null;
+        }
+
+        if ($limit !== null) {
             $this->QBLimit = $limit;
         }