Fix use of setAlias()

Added $this->db->addTableAlias($alias) to setAlias(). This keeps track of the alias and prevents adding the database prefix when using $this->db->protectIdentifiers(). There was some issues with this.

Also made some fixes to updateBatch() and use of RawSql. Just a small fix that allows key value pairs with RawSql.

Author: sclubricants

system/Database/BaseBuilder.php

@@ -1969,6 +1969,7 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
     public function setAlias(string $alias): BaseBuilder
     {
         if ($alias !== '') {
+            $this->db->addTableAlias($alias);
             $this->QBOptions['alias'] = $this->db->protectIdentifiers($alias);
         }
 
@@ -2044,6 +2045,10 @@ public function onConstraint($set)
                     $value = $this->db->protectIdentifiers($value);
                 }
 
+                if (is_string($key)) {
+                    $key = $this->db->protectIdentifiers($key);
+                }
+
                 $this->QBOptions['constraints'][$key] = $value;
             }
         }
@@ -2462,9 +2467,20 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key) => ($key instanceof RawSql ?
-                    $key :
-                    $table . '.' . $key . ' = ' . $alias . '.' . $key),
+                    static fn ($key, $value) => (
+                        ($value instanceof RawSql && is_string($key))
+                        ?
+                        $table . '.' . $key . ' = ' . $value
+                        :
+                        (
+                            $value instanceof RawSql
+                            ?
+                            $value
+                            :
+                            $table . '.' . $value . ' = ' . $alias . '.' . $value
+                        )
+                    ),
+                    array_keys($constraints),
                     $constraints
                 )
             );