Improve performance of quoting column names up to 10% using `array_ma…

…p()`
yiisoft · Oct 4, 2023 · b82cb14 · b82cb14
1 parent c0ced2f
commit b82cb14
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/QueryBuilder/AbstractDMLQueryBuilder.php b/src/QueryBuilder/AbstractDMLQueryBuilder.php
@@ -84,9 +84,10 @@ public function batchInsert(string $table, array $columns, iterable $rows, array
             return '';
         }
 
-        foreach ($columns as $i => $name) {
-            $columns[$i] = $this->quoter->quoteColumnName($name);
-        }
+        $columns = array_map(
+            [$this->quoter, 'quoteColumnName'],
+            $columns,
+        );
 
         return 'INSERT INTO ' . $this->quoter->quoteTableName($table)
             . ' (' . implode(', ', $columns) . ') VALUES ' . implode(', ', $values);
@@ -298,9 +299,10 @@ protected function prepareUpsertColumns(
             /** @psalm-var array<string, mixed> $insertColumns */
             $insertNames = $this->getNormalizeColumnNames(array_keys($insertColumns));
 
-            foreach ($insertNames as $i => $name) {
-                $insertNames[$i] = $this->quoter->quoteColumnName($name);
-            }
+            $insertNames = array_map(
+                [$this->quoter, 'quoteColumnName'],
+                $insertNames,
+            );
         }
 
         /** @psalm-var string[] $uniqueNames */
@@ -374,13 +376,13 @@ static function (Constraint $constraint): string {
             array_filter(
                 $constraints,
                 static function (Constraint $constraint) use ($quoter, $columns, &$columnNames): bool {
-                    /** @psalm-var string[] $getColumnNames */
-                    $getColumnNames = (array) $constraint->getColumnNames();
-                    $constraintColumnNames = [];
+                    /** @psalm-var string[] $constraintColumnNames */
+                    $constraintColumnNames = (array) $constraint->getColumnNames();
 
-                    foreach ($getColumnNames as $columnName) {
-                        $constraintColumnNames[] = $quoter->quoteColumnName($columnName);
-                    }
+                    $constraintColumnNames = array_map(
+                        [$quoter, 'quoteColumnName'],
+                        $constraintColumnNames,
+                    );
 
                     $result = empty(array_diff($constraintColumnNames, $columns));
 
@@ -406,9 +408,9 @@ static function (Constraint $constraint) use ($quoter, $columns, &$columnNames):
      */
     protected function normalizeColumnNames(array $columns): array
     {
-        /** @var string[] $columnList */
-        $columnList = array_keys($columns);
-        $normalizedNames = $this->getNormalizeColumnNames($columnList);
+        /** @var string[] $columnNames */
+        $columnNames = array_keys($columns);
+        $normalizedNames = $this->getNormalizeColumnNames($columnNames);
 
         return array_combine($normalizedNames, $columns);
     }