feat: Added new methods instead of BC

Co-authored-by: Copilot <[email protected]>

Author: patel-vansh

system/Database/BaseBuilder.php

@@ -2925,20 +2925,23 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
     /**
      * Increments a numeric column by the specified value.
      *
-     * @param array<string, int>|string $column The column(s) to increment. Can be a string or an associative array of column => value pairs.
-     * @param int                       $value  The value to increment by (default is 1). Ignored if $column is an associative array.
-     *
      * @return bool
      */
-    public function increment(array|string $column, int $value = 1)
+    public function increment(string $column, int $value = 1)
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
+        return $this->incrementAll([$column => $value]);
+    }
 
+    /**
+     * Increments multiple numeric columns by the specified values.
+     *
+     * @param array<string, int> $columns An array of column => value pairs to increment.
+     */
+    public function incrementAll(array $columns): bool
+    {
         $fields = [];
 
-        foreach ($column as $col => $val) {
+        foreach ($columns as $col => $val) {
             $col          = $this->db->protectIdentifiers($col);
             $fields[$col] = "{$col} + {$val}";
         }
@@ -2957,20 +2960,23 @@ public function increment(array|string $column, int $value = 1)
     /**
      * Decrements a numeric column by the specified value.
      *
-     * @param array<string, int>|string $column The column(s) to decrement. Can be a string or an associative array of column => value pairs.
-     * @param int                       $value  The value to decrement by (default is 1). Ignored if $column is an associative array.
-     *
      * @return bool
      */
-    public function decrement(array|string $column, int $value = 1)
+    public function decrement(string $column, int $value = 1)
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
+        return $this->decrementAll([$column => $value]);
+    }
 
+    /**
+     * Decrements multiple numeric columns by the specified values.
+     *
+     * @param array<string, int> $columns An array of column => value pairs to decrement.
+     */
+    public function decrementAll(array $columns): bool
+    {
         $fields = [];
 
-        foreach ($column as $col => $val) {
+        foreach ($columns as $col => $val) {
             $col          = $this->db->protectIdentifiers($col);
             $fields[$col] = "{$col} - {$val}";
         }

system/Database/Postgre/Builder.php

@@ -87,23 +87,17 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
     }
 
     /**
-     * Increments a numeric column by the specified value.
+     * Increments multiple numeric columns by the specified values.
      *
-     * @return mixed
-     *
-     * @throws DatabaseException
+     * @param array<string, int> $columns An array of column => value pairs to increment.
      */
-    public function increment(array|string $column, int $value = 1)
+    public function incrementAll(array $columns): bool
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
-
         $fields = [];
 
-        foreach ($column as $col => $val) {
-            $col          = $this->db->protectIdentifiers($col);
-            $fields[$col] = "to_number({$col}, '9999999') + {$val}";
+        foreach ($columns as $column => $value) {
+            $column          = $this->db->protectIdentifiers($column);
+            $fields[$column] = "to_number({$column}, '9999999') + {$value}";
         }
 
         $sql = $this->_update($this->QBFrom[0], $fields);
@@ -118,23 +112,17 @@ public function increment(array|string $column, int $value = 1)
     }
 
     /**
-     * Decrements a numeric column by the specified value.
+     * Decrements multiple numeric columns by the specified values.
      *
-     * @return mixed
-     *
-     * @throws DatabaseException
+     * @param array<string, int> $columns An array of column => value pairs to decrement.
      */
-    public function decrement(array|string $column, int $value = 1)
+    public function decrementAll(array $columns): bool
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
-
         $fields = [];
 
-        foreach ($column as $col => $val) {
-            $col          = $this->db->protectIdentifiers($col);
-            $fields[$col] = "to_number({$col}, '9999999') - {$val}";
+        foreach ($columns as $column => $value) {
+            $column          = $this->db->protectIdentifiers($column);
+            $fields[$column] = "to_number({$column}, '9999999') - {$value}";
         }
 
         $sql = $this->_update($this->QBFrom[0], $fields);

system/Database/SQLSRV/Builder.php

@@ -232,24 +232,20 @@ protected function _update(string $table, array $values): string
     }
 
     /**
-     * Increments a numeric column by the specified value.
+     * Increments multiple numeric columns by the specified values.
      *
-     * @return bool
+     * @param array<string, int> $columns An array of column => value pairs to increment.
      */
-    public function increment(array|string $column, int $value = 1)
+    public function incrementAll(array $columns): bool
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
-
         $fields = [];
 
-        foreach ($column as $col => $val) {
-            $col = $this->db->protectIdentifiers($col);
+        foreach ($columns as $column => $value) {
+            $column = $this->db->protectIdentifiers($column);
             if ($this->castTextToInt) {
-                $fields[$col] = "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$col})) + {$val})";
+                $fields[$column] = "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) + {$value})";
             } else {
-                $fields[$col] = "{$col} + {$val}";
+                $fields[$column] = "{$column} + {$value}";
             }
         }
 
@@ -265,24 +261,20 @@ public function increment(array|string $column, int $value = 1)
     }
 
     /**
-     * Decrements a numeric column by the specified value.
+     * Decrements multiple numeric columns by the specified values.
      *
-     * @return bool
+     * @param array<string, int> $columns An array of column => value pairs to decrement.
      */
-    public function decrement(array|string $column, int $value = 1)
+    public function decrementAll(array $columns): bool
     {
-        if (is_string($column)) {
-            $column = [$column => $value];
-        }
-
         $fields = [];
 
-        foreach ($column as $col => $val) {
-            $col = $this->db->protectIdentifiers($col);
+        foreach ($columns as $column => $value) {
+            $column = $this->db->protectIdentifiers($column);
             if ($this->castTextToInt) {
-                $fields[$col] = "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$col})) - {$val})";
+                $fields[$column] = "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) - {$value})";
             } else {
-                $fields[$col] = "{$col} - {$val}";
+                $fields[$column] = "{$column} - {$value}";
             }
         }
 

tests/system/Database/Live/IncrementTest.php

@@ -51,13 +51,13 @@ public function testIncrementWithValue(): void
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
     }
 
-    public function testIncrementWithMultipleColumns(): void
+    public function testIncrementAll(): void
     {
         $this->hasInDatabase('task', ['name' => 'task1', 'description' => '6', 'priority' => '1']);
 
         $this->db->table('task')
             ->where('name', 'task1')
-            ->increment(['description' => 2, 'priority' => 3]);
+            ->incrementAll(['description' => 2, 'priority' => 3]);
 
         $this->seeInDatabase('task', ['name' => 'task1', 'description' => '8', 'priority' => '4']);
     }
@@ -98,13 +98,13 @@ public function testDecrementWithValue(): void
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
     }
 
-    public function testDecrementWithMultipleColumns(): void
+    public function testDecrementAll(): void
     {
         $this->hasInDatabase('task', ['name' => 'task2', 'description' => '6', 'priority' => '5']);
 
         $this->db->table('task')
             ->where('name', 'task2')
-            ->decrement(['description' => 2, 'priority' => 3]);
+            ->decrementAll(['description' => 2, 'priority' => 3]);
 
         $this->seeInDatabase('task', ['name' => 'task2', 'description' => '4', 'priority' => '2']);
     }

user_guide_src/source/changelogs/v4.8.0.rst

@@ -60,7 +60,6 @@ Method Signature Changes
 - **Config:** ``CodeIgniter\Config\Services::request()`` no longer accepts any parameter.
 - **Database:** The following methods have had their signatures updated to remove deprecated parameters:
     - ``CodeIgniter\Database\Forge::_createTable()`` no longer accepts the deprecated ``$ifNotExists`` parameter. The method signature is now ``_createTable(string $table, array $attributes)``.
-    - ``CodeIgniter\Database\BaseBuilder::increment()`` and ``decrement()`` as well as driver-specific builders now accept a string or array for the first parameter, allowing multiple columns to be incremented/decremented in a single call. The method signatures are now ``increment(array|string $column, int $value = 1)`` and ``decrement(array|string $column, int $value = 1)``.
 
 Property Scope Changes
 ======================
@@ -201,7 +200,7 @@ Database
 Query Builder
 -------------
 
-- Added support for incrementing/decrementing multiple columns in a single call to ``BaseBuilder::increment()`` and ``decrement()`` as well as driver-specific builders.
+- Added new ``incrementAll()`` and ``decrementAll()`` methods to ``CodeIgniter\Database\BaseBuilder`` for performing bulk increment/decrement operations.
 
 Forge
 -----

user_guide_src/source/database/query_builder.rst

@@ -2033,25 +2033,41 @@ Class Reference
 
     .. php:method:: increment($column[, $value = 1])
 
-        :param array|string $column: The name of the column(s) to increment. If multiple, then should be an array of column names with their values.
-        :param int $value: The amount to increment in the column (will be ignored if $column is an array)
+        :param string $column: The name of the column to increment
+        :param int $value:  The amount to increment in the column
 
         Increments the value of a field by the specified amount. If the field
         is not a numeric field, like a ``VARCHAR``, it will likely be replaced
         with ``$value``.
 
-        .. note:: Prior to v4.8.0, only single columns could be incremented.
+    .. php:method:: incrementAll(array $columns)
+
+        .. versionadded:: 4.8.0
+
+        :param array $columns: An array of column names with their amounts to increment by
+
+        Increments the value of multiple fields by the specified amounts. If a field
+        is not a numeric field, like a ``VARCHAR``, it will likely be replaced
+        with the amount specified for that field.
 
     .. php:method:: decrement($column[, $value = 1])
 
-        :param array|string $column: The name of the column(s) to decrement. If multiple, then should be an array of column names with their values.
-        :param int $value:  The amount to decrement in the column (will be ignored if $column is an array)
+        :param string $column: The name of the column to decrement
+        :param int $value:  The amount to decrement in the column
 
         Decrements the value of a field by the specified amount. If the field
         is not a numeric field, like a ``VARCHAR``, it will likely be replaced
         with ``$value``.
 
-        .. note:: Prior to v4.8.0, only single columns could be decremented.
+    .. php:method:: decrementAll(array $columns)
+
+        .. versionadded:: 4.8.0
+
+        :param array $columns: An array of column names with their amounts to decrement by
+
+        Decrements the value of multiple fields by the specified amounts. If a field
+        is not a numeric field, like a ``VARCHAR``, it will likely be replaced
+        with the amount specified for that field.
 
     .. php:method:: truncate()