refactor: add castValue() and use it

Author: kenjis

system/Database/BaseBuilder.php

@@ -169,7 +169,8 @@ class BaseBuilder
      *   constraints?: array,
      *   setQueryAsData?: string,
      *   sql?: string,
-     *   alias?: string
+     *   alias?: string,
+     *   fieldTypes?: array<string, string>
      * }
      */
     protected $QBOptions;

system/Database/Postgre/Builder.php

@@ -15,6 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\RawSql;
 use InvalidArgumentException;
+use LogicException;
 
 /**
  * Builder for Postgre
@@ -347,18 +348,18 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             $sql .= "SET\n";
 
-            $fieldTypes = $this->getFieldTypes($table);
+            $this->getFieldTypes($table);
 
+            $that = $this;
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static function ($key, $value) use ($alias, $fieldTypes) {
-                        $type = $fieldTypes[trim($key, '"')] ?? null;
-                        $cast = ($type === null) ? '' : '::' . $type;
+                    static function ($key, $value) use ($alias, $that) {
+                        $fieldName = trim($key, '"');
 
                         return $key . ($value instanceof RawSql ?
                                 ' = ' . $value :
-                                ' = ' . $alias . '.' . $value . $cast);
+                                ' = ' . $alias . '.' . $that->castValue($fieldName, $value));
                     },
                     array_keys($updateFields),
                     $updateFields
@@ -372,7 +373,7 @@ static function ($key, $value) use ($alias, $fieldTypes) {
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static function ($key, $value) use ($table, $alias, $fieldTypes) {
+                    static function ($key, $value) use ($table, $alias, $that) {
                         if ($value instanceof RawSql && is_string($key)) {
                             return $table . '.' . $key . ' = ' . $value;
                         }
@@ -381,10 +382,9 @@ static function ($key, $value) use ($table, $alias, $fieldTypes) {
                             return $value;
                         }
 
-                        $type = $fieldTypes[trim($value, '"')] ?? null;
-                        $cast = ($type === null) ? '' : '::' . $type;
+                        $fieldName = trim($value, '"');
 
-                        return $table . '.' . $value . ' = ' . $alias . '.' . $value . $cast;
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->castValue($fieldName, $value);
                     },
                     array_keys($constraints),
                     $constraints
@@ -414,17 +414,35 @@ static function ($key, $value) use ($table, $alias, $fieldTypes) {
     }
 
     /**
-     * @return array<string, string> [name => type]
+     * Returns cast value.
+     *
+     * @param float|int|string $value Escaped value
+     */
+    private function castValue(string $fieldName, $value): string
+    {
+        if (! isset($this->QBOptions['fieldTypes'])) {
+            throw new LogicException(
+                'You must call getFieldTypes() before calling castValue().'
+            );
+        }
+
+        $type = $this->QBOptions['fieldTypes'][$fieldName] ?? null;
+
+        return ($type === null) ? $value : $value . '::' . $type;
+    }
+
+    /**
+     * Gets filed types from database meta data.
      */
-    private function getFieldTypes(string $table): array
+    private function getFieldTypes(string $table): void
     {
         $types = [];
 
         foreach ($this->db->getFieldData($table) as $field) {
             $types[$field->name] = $field->type;
         }
 
-        return $types;
+        $this->QBOptions['fieldTypes'] = $types;
     }
 
     /**