Fix tests

Author: sclubricants

system/Database/BaseBuilder.php

@@ -2537,10 +2537,10 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             if ($constraints === []) {
                 if ($this->db->DBDebug) {
-                    throw new DatabaseException('You must specify a constraint to match on for batch updates.');
+                    throw new DatabaseException('You must specify a constraint to match on for batch updates.'); // @codeCoverageIgnore
                 }
 
-                return ''; // @codeCoverageIgnor
+                return ''; // @codeCoverageIgnore
             }
 
             $updateFields = $this->QBOptions['updateFields'] ??

system/Database/MySQLi/Builder.php

@@ -69,10 +69,10 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             if ($constraints === []) {
                 if ($this->db->DBDebug) {
-                    throw new DatabaseException('You must specify a constraint to match on for batch updates.');
+                    throw new DatabaseException('You must specify a constraint to match on for batch updates.'); // @codeCoverageIgnore
                 }
 
-                return ''; // @codeCoverageIgnor
+                return ''; // @codeCoverageIgnore
             }
 
             $updateFields = $this->QBOptions['updateFields'] ??

system/Database/OCI8/Builder.php

@@ -357,7 +357,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
                     throw new DatabaseException('You must specify a constraint to match on for batch updates.');
                 }
 
-                return ''; // @codeCoverageIgnor
+                return ''; // @codeCoverageIgnore
             }
 
             $updateFields = $this->QBOptions['updateFields'] ??

tests/system/Database/Live/SclubricantsTest.php

@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Live;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Forge;
 use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -39,10 +40,6 @@ final class SclubricantsTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-
-        if ($this->db->DBDriver === 'SQLite3' && ! (version_compare($this->db->getVersion(), '3.33.0') >= 0)) {
-            $this->markTestSkipped('Only SQLite 3.33 and newer can complete this test.');
-        }
     }
 
     public function setupTable()
@@ -150,6 +147,10 @@ public function setupTable()
 
     public function testUpdateBatchUpdateFieldsAndAlias()
     {
+        if ($this->db->DBDriver === 'SQLite3' && ! (version_compare($this->db->getVersion(), '3.33.0') >= 0)) {
+            $this->markTestSkipped('Only SQLite 3.33 and newer can complete this test.');
+        }
+
         $data = [
             [
                 'email'   => '[email protected]',
@@ -238,6 +239,10 @@ public function testUpdateBatchUpdateFieldsAndAlias()
 
     public function testUpdateBatchWithoutOnConstraint()
     {
+        if ($this->db->DBDriver === 'SQLite3' && ! (version_compare($this->db->getVersion(), '3.33.0') >= 0)) {
+            $this->markTestSkipped('Only SQLite 3.33 and newer can complete this test.');
+        }
+
         $data = [
             [
                 'name'    => 'Derek Nothing', // won't update
@@ -274,8 +279,20 @@ public function testUpdateBatchWithoutOnConstraint()
         }
     }
 
+    public function testUpsertNoData()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('No data availble to process.');
+
+        $this->db->table('user')->onConstraint('email')->upsertBatch();
+    }
+
     public function testUpdateWithQuery()
     {
+        if ($this->db->DBDriver === 'SQLite3' && ! (version_compare($this->db->getVersion(), '3.33.0') >= 0)) {
+            $this->markTestSkipped('Only SQLite 3.33 and newer can complete this test.');
+        }
+
         $this->setupTable();
 
         $updateFields = ['country', 'updated_at' => new RawSql('CURRENT_TIMESTAMP')];
@@ -380,12 +397,33 @@ public function testSetBatchOneRow()
         $evenMoreData->email   = '[email protected]';
         $evenMoreData->country = 'Netherlands';
 
-        $builder->updateBatch($evenMoreData, 'email');
+        $builder->onConstraint('email')->upsertBatch($evenMoreData, true, 2);
 
         $result = $this->db->table('user')->get()->getResultArray();
 
         foreach ($result as $row) {
             $this->assertSame('Netherlands', $row['country']);
         }
     }
+
+    public function testRawSqlConstraint()
+    {
+        if ($this->db->DBDriver === 'SQLite3' && ! (version_compare($this->db->getVersion(), '3.33.0') >= 0)) {
+            $this->markTestSkipped('Only SQLite 3.33 and newer can complete this test.');
+        }
+
+        $data = [
+            [
+                'name'    => 'Derek Jones',
+                'email'   => '[email protected]',
+                'country' => 'Germany',
+            ],
+        ];
+
+        $builder = $this->db->table('user');
+
+        $builder->setBatch($data, true, 'db_myalias')->updateFields('name, country')->onConstraint(new RawSql($this->db->protectIdentifiers('user.email') . ' = ' . $this->db->protectIdentifiers('myalias.email')))->updateBatch();
+
+        $this->seeInDatabase('user', ['email' => '[email protected]', 'country' => 'Germany']);
+    }
 }