fix: select() with first param as RawSql

Author: kenjis

system/Database/BaseBuilder.php

@@ -3060,15 +3060,17 @@ protected function compileSelect($selectOverride = false): string
 
             if (empty($this->QBSelect)) {
                 $sql .= '*';
-            } elseif ($this->QBSelect[0] instanceof RawSql) {
-                $sql .= (string) $this->QBSelect[0];
             } else {
                 // Cycle through the "select" portion of the query and prep each column name.
                 // The reason we protect identifiers here rather than in the select() function
                 // is because until the user calls the from() function we don't know if there are aliases
                 foreach ($this->QBSelect as $key => $val) {
-                    $protect              = $this->QBNoEscape[$key] ?? null;
-                    $this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $protect);
+                    if ($val instanceof RawSql) {
+                        $this->QBSelect[$key] = (string) $this->QBSelect[0];
+                    } else {
+                        $protect              = $this->QBNoEscape[$key] ?? null;
+                        $this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $protect);
+                    }
                 }
 
                 $sql .= implode(', ', $this->QBSelect);

tests/system/Database/Builder/SelectTest.php

@@ -72,12 +72,12 @@ public function testSelectAcceptsArrayWithRawSql(): void
         $builder = new BaseBuilder('employees', $this->db);
 
         $builder->select([
-            'employee_id',
             new RawSql("IF(salary > 5000, 'High', 'Low') AS salary_level"),
+            'employee_id',
         ]);
 
         $expected = <<<'SQL'
-            SELECT "employee_id", IF(salary > 5000, 'High', 'Low') AS salary_level FROM "employees"
+            SELECT IF(salary > 5000, 'High', 'Low') AS salary_level, "employee_id" FROM "employees"
             SQL;
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }