Fix restriction: "keys inside the array list must match" at \ClickHou…

…seDB\Client::prepareInsertAssocBulk
glushkovds · Dec 18, 2020 · a7202ac · a7202ac
1 parent f73f11a
commit a7202ac
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/BaseModel.php b/src/BaseModel.php
@@ -142,6 +142,13 @@ public static function prepareAndInsert($rows, $columns = [])
      */
     public static function insertAssoc($rows)
     {
+        $rows = array_values($rows);
+        if (isset($rows[0]) && isset($rows[1])) {
+            $keys = array_keys($rows[0]);
+            foreach ($rows as &$row) {
+                $row = array_replace(array_flip($keys), $row);
+            }
+        }
         return static::getClient()->insertAssocBulk((new static)->getTable(), $rows);
     }
 
@@ -152,14 +159,8 @@ public static function insertAssoc($rows)
      */
     public static function prepareAndInsertAssoc($rows)
     {
-        $rows = array_values(array_map('static::prepareAssocFromRequest', $rows));
-        if (isset($rows[0]) && isset($rows[1])) {
-            $keys = array_keys($rows[0]);
-            foreach ($rows as &$row) {
-                $row = array_replace(array_flip($keys), $row);
-            }
-        }
-        return static::getClient()->insertAssocBulk((new static)->getTable(), $rows);
+        $rows = array_map('static::prepareAssocFromRequest', $rows);
+        return static::insertAssoc($rows);
     }
 
     /**