CHG Upsert disables update action if update column is empty array

Author: francerz

src/DatabaseHandler.php

@@ -202,11 +202,7 @@ public function executeUpsert(UpsertQuery $query): UpsertResult
         $keys = array_combine($keys, $keys);
 
         // Creates a transaction to prevent concurrent failures.
-        $transactionStarted = false;
-        if (!$this->inTransaction()) {
-            $this->startTransaction();
-            $transactionStarted = true;
-        }
+        $this->startTransaction();
 
         // Finds all rows that can match.
         $index = new Index($query, $keys);
@@ -246,7 +242,7 @@ public function executeUpsert(UpsertQuery $query): UpsertResult
             $insertedId = $insertResult->getInsertedId();
             $success &= $insertResult->success();
         }
-        if (!empty($updates)) {
+        if (!empty($updates) && !empty($query->getUpdateColumns())) {
             foreach ($updates as $u) {
                 $updateQuery = Query::update($query->getTable(), $u, $query->getKeys(), $query->getUpdateColumns());
                 $updateResult = $this->executeUpdate($updateQuery);
@@ -256,9 +252,8 @@ public function executeUpsert(UpsertQuery $query): UpsertResult
         }
 
         // Commits transaction if this started inside this method.
-        if ($transactionStarted) {
-            $this->commit();
-        }
+        $this->commit();
+
         return new UpsertResult($inserts, $updates, $numInserts, $numUpdates, $insertedId, true);
     }
 

src/Query.php

@@ -84,7 +84,7 @@ public static function update($table, $data = null, ?array $matching = null, ?ar
     {
         return UpdateQuery::createUpdate($table, $data, $matching, $columns);
     }
-    public static function upsert($table, $data = null, array $keys = [], array $columns = [])
+    public static function upsert($table, $data = null, array $keys = [], ?array $columns = null)
     {
         return new UpsertQuery(Table::fromExpression($table), $data, $keys, $columns);
     }

src/UpsertQuery.php

@@ -15,13 +15,13 @@ class UpsertQuery implements Iterator, Countable
     private $keys = [];
     private $columns = [];
 
-    public function __construct($table = null, $values = null, array $keys = [], array $columns = [])
+    public function __construct($table = null, $values = null, array $keys = [], ?array $columns = null)
     {
         if (isset($table)) {
             $this->setTable($table);
         }
         if (isset($values)) {
-            $cols = empty($columns) ? [] : array_merge($keys, $columns);
+            $cols = isset($columns) ? array_merge($keys, $columns) : $columns;
             $this->setValues($values, $cols);
         }
         $this->keys = $keys;
@@ -51,9 +51,12 @@ private static function normalizeColumns(array $columns = [])
         return $newColumns;
     }
 
-    public function setValues($values, array $columns = [])
+    public function setValues($values, ?array $columns = null)
     {
-        $columns = static::normalizeColumns($columns);
+        if (is_array($columns) && empty($columns)) {
+            return;
+        }
+        $columns = static::normalizeColumns($columns ?? []);
         if (is_array($values) && count(array_filter(array_keys($values), 'is_int')) > 0) {
             foreach ($values as $row) {
                 $this->setValues($row, $columns);

test/UpsertQueryTest.php

@@ -29,5 +29,10 @@ public function testUpsertColumns()
         $this->assertEquals(['user_id', 'username', 'password', 'enabled'], $query->getColumns());
         $this->assertEquals(['user_id'], $query->getKeys());
         $this->assertEquals(['username', 'password', 'enabled'], $query->getUpdateColumns());
+
+        $query = Query::upsert('users', $obj, ['username', 'enabled'], []);
+        $this->assertEquals(['username', 'enabled'], $query->getColumns());
+        $this->assertEquals(['username', 'enabled'], $query->getKeys());
+        $this->assertEquals([], $query->getUpdateColumns());
     }
 }