moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-79270-fix' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Sara Arjona 2023-12-14 08:41:34 +01:00
commit 8d5dbb56ff
No known key found for this signature in database
1 changed files with 19 additions and 1 deletions
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 * 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 * @return string
*/ */
public function get_sql_sort() { public function get_sql_sort() {
$columnsbyalias = $this->report->get_active_columns_by_alias(); $columnsbyalias = $this->report->get_active_columns_by_alias();
$columnsortby = []; $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. // 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; $column = $columnsbyalias[$alias] ?? null;
// If the column is not being aggregated and defines custom sort fields, then use them. // 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); return static::construct_order_by($columnsortby);
} }