ok

Author: ierusalim

src/ClickHouseFunctions.php

@@ -145,9 +145,9 @@ public function delTypeAlias($alias)
      */
     public function changeIfIsAlias($type_src)
     {
-        static $aliases_arr = false;
+        static $aliases_arr = [];
         $t_lower = \strtolower($type_src);
-        if (!$aliases_arr || empty($type_src)) {
+        if (empty($aliases_arr) || empty($type_src)) {
             $aliases_arr = $this->types_aliases;
             foreach ($this->types_fix_size as $canon => $v) {
                 $aliases_arr[strtolower($canon)] = $canon;
@@ -519,13 +519,13 @@ public function getTableRowSize($table_or_fields_arr)
             $fields_arr = $table_or_fields_arr;
             $table_name = null;
         }
-        $dynamic_fields = 0;
-        $fixed_bytes = $comment = $this->countRowFixedSize($fields_arr, $dynamic_fields);
-        if (!\is_numeric($fixed_bytes)) {
+        $fixed_bytes = $this->countRowFixedSize($fields_arr);
+        if (!\is_array($fixed_bytes)) {
             return $fixed_bytes;
         }
+        \extract($fixed_bytes); // fixed_bytes, dynamic_fields
         $fixed_fields = \count($fields_arr) - $dynamic_fields;
-        $comment .= " bytes in $fixed_fields FIXED FIELDS, $dynamic_fields DYNAMIC FIELDS";
+        $comment = "$fixed_bytes bytes in $fixed_fields FIXED FIELDS, $dynamic_fields DYNAMIC FIELDS";
         return \compact('table_name', 'fixed_bytes', 'fixed_fields', 'dynamic_fields', 'comment');
     }
 
@@ -536,9 +536,9 @@ public function getTableRowSize($table_or_fields_arr)
      *
      * @param array $fields_arr Array [field_name]=>[field_type]
      * @param integer $dynamic_fields (by reference)
-     * @return integer|string Integer of fixed_bytes or string with error description
+     * @return array|string Array of [fixed_bytes,dynamic_fields] or string with error description
      */
-    public function countRowFixedSize($fields_arr, &$dynamic_fields = 0)
+    public function countRowFixedSize($fields_arr)
     {
         if (!\is_array($fields_arr) || !\count($fields_arr)) {
             return "Need array";
@@ -549,15 +549,15 @@ public function countRowFixedSize($fields_arr, &$dynamic_fields = 0)
         } catch (\Exception $e) {
             return $e->getMessage();
         }
-        $sum = 0;
+        $fixed_bytes = $dynamic_fields = 0;
         foreach (\array_column($parsed_arr, 'bytes') as $bytes) {
             if ($bytes) {
-                $sum += $bytes;
+                $fixed_bytes += $bytes;
             } else {
                 $dynamic_fields++;
             }
         }
-        return $sum;
+        return compact('fixed_bytes', 'dynamic_fields');
     }
 
     /**

src/ClickHouseQuery.php

@@ -601,7 +601,7 @@ public function quotePar($str, $quote = "'")
         return (is_numeric($str) ||
            (($fc === '"' || $fc === "'") && ($fc === $lc)) ||
            (($lc === ')' && strpos($str, '(') !== false)) ||
-           (($fc === '[' && $lc ===']'))
+           (($fc === '[' && $lc === ']'))
         ) ? $str : $quote . addcslashes($str, "'\t\n\r\0") . $quote;
     }
 

tests/src/ClickHouseFunctionsTest.php

@@ -221,17 +221,17 @@ public function testGetTableRowSize()
     public function testCountRowFixedSize()
     {
         $ch = $this->object;
-        $dyna = 0;
-        $sum = $ch->countRowFixedSize(['int16', 'int32', 'int64', 'String'], $dyna);
-        $this->assertEquals(14, $sum);
-        $this->assertEquals(1, $dyna);
+        $fixed_bytes = $ch->countRowFixedSize(['int16', 'int32', 'int64', 'String']);
+        \extract($fixed_bytes); // fixed_bytes, dynamic_fields
+        $this->assertEquals(14, $fixed_bytes);
+        $this->assertEquals(1, $dynamic_fields);
 
         // exceptions
-        $sum = $ch->countRowFixedSize([]);
-        $this->assertTrue(is_string($sum));
+        $fixed_bytes = $ch->countRowFixedSize([]);
+        $this->assertTrue(is_string($fixed_bytes));
 
-        $sum = $ch->countRowFixedSize(['int16','badtype']);
-        $this->assertTrue(is_string($sum));
+        $fixed_bytes = $ch->countRowFixedSize(['int16','badtype']);
+        $this->assertTrue(is_string($fixed_bytes));
     }
 
     /**