Minor refactoring of Query (#1116)

Tigrov · web-flow · commit 2df41d31e774 · 2025-12-03T13:59:59.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -70,7 +70,7 @@
 - Enh #929: Implement lazy arrays for array, structured and JSON column types (@Tigrov)
 - Bug #933: Explicitly mark nullable parameters (@vjik)
 - Chg #911, #1113: Change supported PHP versions to `8.1 - 8.5` (@Tigrov, @vjik)
-- Enh #911, #940: Minor refactoring (@Tigrov)
+- Enh #911, #940, #1116: Minor refactoring (@Tigrov)
 - Chg #938, #936, #937: Remove `ext-json`, `ext-ctype`, `ext-mbstring` from `require` section of `composer.json` (@Tigrov) 
 - Chg #936: Remove `hasLimit()` and `hasOffset()` methods from `AbstractDQLQueryBuilder` class (@Tigrov)
 - Chg #937: Remove `baseName()` and `pascalCaseToId()` methods from `DbStringHelper` (@Tigrov)
diff --git a/src/Query/Query.php b/src/Query/Query.php
@@ -22,6 +22,7 @@
 use function array_key_exists;
 use function array_map;
 use function array_merge;
+use function array_push;
 use function array_shift;
 use function array_unshift;
 use function count;
@@ -152,16 +153,18 @@ public function addParams(array $params): static
 
         if (empty($this->params)) {
             $this->params = $params;
-        } else {
-            foreach ($params as $name => $value) {
-                if (is_int($name)) {
-                    $this->params[] = $value;
-                } else {
-                    $this->params[$name] = $value;
-                }
-            }
+
+            return $this;
         }
 
+        if (is_int(key($params))) {
+            array_push($this->params, ...$params);
+
+            return $this;
+        }
+
+        $this->params = [...$this->params, ...$params];
+
         return $this;
     }
 
@@ -1026,7 +1029,7 @@ private function normalizeSelect(array|bool|float|int|string|ExpressionInterface
 
             if (is_string($columnDefinition)) {
                 if (
-                    preg_match('/^(.*?)(?i:\s+as\s+|\s+)([\w\-_.]+)$/', $columnDefinition, $matches)
+                    preg_match('/^(.*?)\s+(?i:as\s+)?([\w\-_.]+)$/', $columnDefinition, $matches) === 1
                     && !preg_match('/^\d+$/', $matches[2])
                     && !str_contains($matches[2], '.')
                 ) {
