Query: Fix that aliases are ignored in withColumns()

Icinga · Apr 12, 2023 · 3b7dca6 · 3b7dca6
1 parent c5f2fda
commit 3b7dca6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/Query.php b/src/Query.php
@@ -260,11 +260,11 @@ public function withColumns($columns)
         $tableName = $this->getModel()->getTableAlias();
 
         $qualifiedColumns = [];
-        foreach ((array) $columns as $column) {
+        foreach ((array) $columns as $alias => $column) {
             if (! $column instanceof ExpressionInterface) {
-                $qualifiedColumns[] = $this->getResolver()->qualifyPath($column, $tableName);
+                $qualifiedColumns[$alias] = $this->getResolver()->qualifyPath($column, $tableName);
             } else {
-                $qualifiedColumns[] = $column;
+                $qualifiedColumns[$alias] = $column;
             }
         }
 

diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -401,6 +401,23 @@ public function testWithColumnsSupportsExpressions()
         );
     }
 
+    public function testWithColumnsHandlesCustomAliasesCorrectly()
+    {
+        $query = (new Query())
+            ->setModel(new User())
+            ->columns('username');
+
+        $query->withColumns([
+            'my_pw' => 'password',
+            'one' => new Expression('1')
+        ]);
+
+        $this->assertSql(
+            'SELECT user.password AS my_pw, (1) AS one, user.username FROM user',
+            $query->assembleSelect()
+        );
+    }
+
     public function testWithoutColumnsPreventsSelection()
     {
         $query = (new Query())