Merge pull request #16452 from niden/T16451-dm-select

T16451 dm select
phalcon · Oct 14, 2023 · 3e46944 · 3e46944
2 parents da8d71b + cdff0ec
commit 3e46944
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 30 deletions.
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -5,6 +5,7 @@
 ### Changed
 
 - Changed `Phalcon\Mvc\Model::getMessages()` to also filter with an array of fields [#16265](https://github.com/phalcon/cphalcon/issues/16265)
+- Changed `Phalcon\DataMapper\Query\Select::columns()` to accept an array of columns (keys as aliases) instead of `func_get_args` [#16451](https://github.com/phalcon/cphalcon/issues/16451)
 
 ### Added
 

diff --git a/composer.lock b/composer.lock
diff --git a/phalcon/DataMapper/Query/Select.zep b/phalcon/DataMapper/Query/Select.zep
@@ -164,18 +164,29 @@ class Select extends AbstractConditions
     }
 
     /**
-     * The columns to select from. If a key is set in an array element, the
+     * The columns to select from. If a key is set in the array element, the
      * key will be used as the alias
      *
-     * @param string ...$column
+     * @param array $columns
      *
      * @return Select
      */
-    public function columns() -> <Select>
+    public function columns(array columns) -> <Select>
     {
+        var key, value;
+        array localColumns = [];
+
+        for key, value in columns {
+            if is_int(key) {
+                let localColumns[] = value;
+            } else {
+                let localColumns[] = value . " AS " . key;
+            }
+        }
+
         let this->store["COLUMNS"] = array_merge(
             this->store["COLUMNS"],
-            func_get_args()
+            localColumns
         );
 
         return this;

diff --git a/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php b/tests/database/DataMapper/Pdo/Profiler/MemoryLogger/LogCest.php
@@ -13,7 +13,7 @@
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\MemoryLogger;
-use Phalcon\Logger\LogLevel;
+use Phalcon\Logger\Enum;
 
 class LogCest
 {
@@ -37,7 +37,7 @@ public function dMPdoProfilerMemoryLoggerLog(DatabaseTester $I)
             "backtrace" => "backtrace",
         ];
 
-        $logger->log(LogLevel::INFO, $message, $context);
+        $logger->log(Enum::INFO, $message, $context);
 
         $expected = ["f1 (123 seconds): select backtrace"];
         $message  = $logger->getMessages();

diff --git a/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php b/tests/database/DataMapper/Pdo/Profiler/Profiler/GetSetLogLevelCest.php
@@ -13,7 +13,7 @@
 
 use DatabaseTester;
 use Phalcon\DataMapper\Pdo\Profiler\Profiler;
-use Phalcon\Logger\LogLevel;
+use Phalcon\Logger\Enum;
 
 class GetSetLogLevelCest
 {
@@ -30,13 +30,13 @@ public function dMPdoProfilerProfilerGetSetLogLevel(DatabaseTester $I)
         $profiler = new Profiler();
 
         $I->assertEquals(
-            LogLevel::DEBUG,
+            Enum::DEBUG,
             $profiler->getLogLevel()
         );
 
-        $profiler->setLogLevel(LogLevel::INFO);
+        $profiler->setLogLevel('info');
         $I->assertEquals(
-            LogLevel::INFO,
+            'info',
             $profiler->getLogLevel()
         );
     }