Fix SQLite and OCI8

A couple of small fixes. OCI8 is strict about identifiers. SQLite alternate update needed a small adjustment.

Author: sclubricants

system/Database/SQLite3/Builder.php

@@ -93,6 +93,8 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
         $final = [];
 
         foreach ($values as $val) {
+            $val = array_combine($keys, $val);
+
             $ids[] = $val[$index];
 
             foreach (array_keys($val) as $field) {

tests/system/Database/Live/UpdateTest.php

@@ -242,6 +242,10 @@ public function testSetWithBoolean()
 
     public function testUpdateBatchTwoConstraints()
     {
+        if (version_compare($this->db->getVersion(), '3.33.0') < 0) {
+            $this->markTestSkipped('This SQLite version does not support this test.');
+        }
+
         $data = [
             [
                 'id'      => 1,
@@ -269,6 +273,10 @@ public function testUpdateBatchTwoConstraints()
 
     public function testUpdateBatchConstraintsRawSqlandAlias()
     {
+        if (version_compare($this->db->getVersion(), '3.33.0') < 0) {
+            $this->markTestSkipped('This SQLite version does not support this test.');
+        }
+
         $data = [
             [
                 'id'      => 1,
@@ -292,7 +300,12 @@ public function testUpdateBatchConstraintsRawSqlandAlias()
             ],
         ];
 
-        $this->db->table('user')->setData($data, true, 'd')->updateBatch(null, ['id', new RawSql("d.country LIKE 'U%'")]);
+        $this->db->table('user')->setData($data, true, 'd')->updateBatch(
+            null,
+            ['id', new RawSql($this->db->protectIdentifiers('d')
+            . '.' . $this->db->protectIdentifiers('country')
+            . " LIKE 'U%'")]
+        );
 
         $this->seeInDatabase('user', [
             'name'    => 'Derek Jones Changes',