fix: Builder update() does not accept an object

codeigniter4 · Jul 1, 2022 · 32c1ffc · 32c1ffc
1 parent 6cd8356
commit 32c1ffc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2014,11 +2014,12 @@ public function getCompiledUpdate(bool $reset = true)
  /**
  * Compiles an update string and runs the query.
  *
- * @param mixed $where
+ * @param null|array|object $set
+ * @param array|RawSql|string|null $where
  *
  * @throws DatabaseException
  */
- public function update(?array $set = null, $where = null, ?int $limit = null): bool
+ public function update($set = null, $where = null, ?int $limit = null): bool
  {
  if ($set !== null) {
  $this->set($set);

diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
@@ -34,11 +34,35 @@ protected function setUp(): void
  $this->db = new MockConnection([]);
  }
 
- public function testUpdate()
+ public function testUpdateArray()
  {
  $builder = new BaseBuilder('jobs', $this->db);
 
- $builder->testMode()->where('id', 1)->update(['name' => 'Programmer'], null, null);
+ $data = ['name' => 'Programmer'];
+ $builder->testMode()->where('id', 1)->update($data, null, null);
+
+ $expectedSQL = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
+ $expectedBinds = [
+ 'id' => [
+ 1,
+ true,
+ ],
+ 'name' => [
+ 'Programmer',
+ true,
+ ],
+ ];
+
+ $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+ $this->assertSame($expectedBinds, $builder->getBinds());
+ }
+
+ public function testUpdateObject()
+ {
+ $builder = new BaseBuilder('jobs', $this->db);
+
+ $data = (object) ['name' => 'Programmer'];
+ $builder->testMode()->where('id', 1)->update($data, null, null);
 
  $expectedSQL = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
  $expectedBinds = [