mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

MDL-79270 reportbuilder: remove duplicate columns from order clause.

Browse Source 
This works around a problem in SQL Server, which caused it to throw a
DML exception if the same column is duplicated in `ORDER BY` clause.
This commit is contained in:
Paul Holden 2023-12-13 17:10:46 +00:00
parent 95cd15ea12
commit 8f32e623bb
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
reportbuilder/classes/table/base_report_table.php
View File

@ -186,14 +186,24 @@ abstract class base_report_table extends table_sql implements dynamic, renderabl
/**
* Override parent method of the same, to ensure that any columns with custom sort fields are accounted for
*
* Because the base table_sql has "special" handling of fullname columns {@see table_sql::contains_fullname_columns}, we need
* to handle that here to ensure that any that are being sorted take priority over reportbuilders own aliases of the same
* columns. This prevents them appearing multiple times in a query, which SQL Server really doesn't like
*
* @return string
*/
public function get_sql_sort() {
$columnsbyalias = $this->report->get_active_columns_by_alias();
$columnsortby = [];
// First pass over sorted columns, to extract all the fullname fields from table_sql.
$sortedcolumns = $this->get_sort_columns();
$sortedcolumnsfullname = array_filter($sortedcolumns, static function(string $alias): bool {
return !preg_match('/^c[\d]+_/', $alias);
}, ARRAY_FILTER_USE_KEY);
// Iterate over all sorted report columns, replace with columns own fields if applicable.
foreach ($this->get_sort_columns() as $alias => $order) {
foreach ($sortedcolumns as $alias => $order) {
$column = $columnsbyalias[$alias] ?? null;
// If the column is not being aggregated and defines custom sort fields, then use them.
@ -208,6 +218,14 @@ abstract class base_report_table extends table_sql implements dynamic, renderabl
}
}
// Now ensure that any fullname sorted columns have duplicated aliases removed.
$columnsortby = array_filter($columnsortby, static function(string $alias) use ($sortedcolumnsfullname): bool {
if (preg_match('/^c[\d]+_(?<column>.*)$/', $alias, $matches)) {
return !array_key_exists($matches['column'], $sortedcolumnsfullname);
}
return true;
}, ARRAY_FILTER_USE_KEY);
return static::construct_order_by($columnsortby);
}