Extend supported quote identifiers for ranking order unaliasing

Author: mneudert

core/RankingQuery.php

@@ -737,14 +737,14 @@ private function prepareColumnsForWindowOrderBy(?string $expr, string $selectCol
 
             $column = str_replace('`', '', trim($columnParts[0]));
 
-            if (preg_match('/`?' . $column . '`? AS `?(\w+)`?(?:,|$)/is', $selectColumns, $matches)) {
+            if (preg_match('/`?' . $column . '`? AS [`"\']?(\w+)[`"\']?(?:,|$)/is', $selectColumns, $matches)) {
                 // unalias the column to allow usage in window
                 $column = trim($matches[1]);
                 $columnParts[0] = '`' . $column . '`';
                 $exprColumn = implode(' ', $columnParts);
             }
 
-            if (!preg_match('/`?' . $column . '`?(?:,|$)/is', $selectColumns)) {
+            if (!preg_match('/[`"\']?' . $column . '[`"\']?(?:,|$)/is', $selectColumns)) {
                 // the column was not found as "column," or "column<end of select>" in the SELECT part
                 // we remove it from the window because it otherwise break the query
                 unset($exprColumns[$i]);

tests/PHPUnit/Unit/RankingQueryTest.php

@@ -749,6 +749,27 @@ public function getGenerateWindowOrderByStringTestData(): iterable
             '`column_new`',
         ];
 
+        yield 'column aliases are resolved - backtick quoted' => [
+            $rankingQuery,
+            'SELECT column_one AS `column_new` FROM my_table ORDER BY column_one',
+            false,
+            '`column_new`',
+        ];
+
+        yield 'column aliases are resolved - double quoted' => [
+            $rankingQuery,
+            'SELECT column_one AS "column_new" FROM my_table ORDER BY column_one',
+            false,
+            '`column_new`',
+        ];
+
+        yield 'column aliases are resolved - single quoted' => [
+            $rankingQuery,
+            "SELECT column_one AS 'column_new' FROM my_table ORDER BY column_one",
+            false,
+            '`column_new`',
+        ];
+
         yield 'column aliases are resolved - rollup' => [
             $rankingQuery,
             '