Merge pull request #6146 from iRedds/fix/qb-increment-decrement

Fixed: BaseBuilder increment/decrement do not reset state after a query
codeigniter4 · Jun 19, 2022 · 44cbd89 · 44cbd89
2 parents 24d23c1 + 11f57e5
commit 44cbd89
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 6 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2369,7 +2369,13 @@ public function increment(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], [$column => "{$column} + {$value}"]);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**
@@ -2383,7 +2389,13 @@ public function decrement(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], [$column => "{$column}-{$value}"]);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
@@ -96,7 +96,13 @@ public function increment(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') + {$value}"]);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**
@@ -112,7 +118,13 @@ public function decrement(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') - {$value}"]);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**

diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
@@ -255,7 +255,13 @@ public function increment(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], $values);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**
@@ -275,7 +281,13 @@ public function decrement(string $column, int $value = 1)
 
         $sql = $this->_update($this->QBFrom[0], $values);
 
-        return $this->db->query($sql, $this->binds, false);
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            return $this->db->query($sql, $this->binds, false);
+        }
+
+        return true;
     }
 
     /**

diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
@@ -49,6 +49,20 @@ public function testIncrementWithValue()
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
     }
 
+    public function testResetStateAfterIncrement()
+    {
+        $this->hasInDatabase('job', ['name' => 'account1', 'description' => '10']);
+        $this->hasInDatabase('job', ['name' => 'account2', 'description' => '10']);
+
+        $builder = $this->db->table('job');
+
+        $builder->where('name', 'account1')->increment('description');
+        $builder->where('name', 'account2')->increment('description');
+
+        $this->seeInDatabase('job', ['name' => 'account1', 'description' => '11']);
+        $this->seeInDatabase('job', ['name' => 'account2', 'description' => '11']);
+    }
+
     public function testDecrement()
     {
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
@@ -70,4 +84,18 @@ public function testDecrementWithValue()
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
     }
+
+    public function testResetStateAfterDecrement()
+    {
+        $this->hasInDatabase('job', ['name' => 'account1', 'description' => '10']);
+        $this->hasInDatabase('job', ['name' => 'account2', 'description' => '10']);
+
+        $builder = $this->db->table('job');
+
+        $builder->where('name', 'account1')->decrement('description');
+        $builder->where('name', 'account2')->decrement('description');
+
+        $this->seeInDatabase('job', ['name' => 'account1', 'description' => '9']);
+        $this->seeInDatabase('job', ['name' => 'account2', 'description' => '9']);
+    }
 }
diff --git a/user_guide_src/source/changelogs/v4.2.2.rst b/user_guide_src/source/changelogs/v4.2.2.rst
@@ -0,0 +1,35 @@
+Version 4.2.2
+#############
+
+Release Date: Unreleased
+
+**4.2.2 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+BREAKING
+********
+
+none.
+
+Enhancements
+************
+
+none.
+
+Changes
+*******
+
+- Fixed: ``BaseBuilder::increment()`` and ``BaseBuilder::decrement()`` do not reset the ``BaseBuilder`` state after a query.
+
+Deprecations
+************
+
+none.
+
+Bugs Fixed
+**********
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.