Fix a few things to increase code coverage

Removed unused code, added some tests to increase code coverage

Author: sclubricants

system/Database/OCI8/Builder.php

@@ -356,15 +356,6 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
             $updateFields = $this->QBOptions['updateFields'] ?? $this->updateFields($keys, false, $constraints)->QBOptions['updateFields'] ?? [];
 
-            if (empty($updateFields)) {
-                $updateFields = array_filter(
-                    $keys,
-                    static fn ($columnName) => ! (in_array($columnName, $constraints, true))
-                );
-
-                $this->QBOptions['updateFields'] = $updateFields;
-            }
-
             $sql = 'MERGE INTO ' . $table . "\nUSING (\n{:_table_:}";
 
             $sql .= ') "_upsert"' . "\nON (";

system/Database/SQLSRV/Builder.php

@@ -637,7 +637,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
             $tableIdentity = $this->QBOptions['tableIdentity'] ?? '';
             $sql           = "SELECT name from syscolumns where id = Object_ID('" . $table . "') and colstat = 1";
             if (($query = $this->db->query($sql)) === false) {
-                throw new DatabaseException('Failed to get table identity');
+                throw new DatabaseException('Failed to get table identity'); // @codeCoverageIgnore
             }
             $query = $query->getResultObject();
 
@@ -687,15 +687,6 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
 
             $updateFields = $this->QBOptions['updateFields'] ?? $this->updateFields($keys, false, $constraints)->QBOptions['updateFields'] ?? [];
 
-            if (empty($updateFields)) {
-                $updateFields = array_filter(
-                    $fieldNames,
-                    static fn ($columnName) => ! (in_array($columnName, $constraints, true))
-                );
-
-                $this->QBOptions['updateFields'] = $updateFields;
-            }
-
             $sql = 'MERGE INTO ' . $fullTableName . "\nUSING (\n";
 
             $sql .= '{:_table_:}';

tests/system/Database/Live/UpdateTest.php

@@ -482,4 +482,19 @@ public function testRawSqlConstraint()
 
         $this->seeInDatabase('user', ['email' => '[email protected]', 'country' => 'Germany']);
     }
+
+    public function testNoConstraintFound()
+    {
+        $jobData = [
+            'name'        => 'Programmer',
+            'description' => 'General PHP Coding',
+        ];
+
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('You must specify a constraint to match on for batch updates.');
+
+        $this->db->table('job')
+            ->updateBatch($jobData);
+
+    }
 }

tests/system/Database/Live/UpsertTest.php

@@ -253,8 +253,10 @@ public function testUpsertCauseConstraintError()
 
         $this->expectException(DatabaseException::class);
 
+        $esc = $this->db->escapeChar;
+
         $this->db->table('user')
-            ->onConstraint('id')
+            ->onConstraint(new RawSql($esc . 'user' . $esc . '.' . $esc. 'id' . $esc))
             ->updateFields('name, email, country')
             ->upsert($userData);
     }