Skip to content
Snippets Groups Projects
Commit 4e573958 authored by colemanw's avatar colemanw
Browse files

Backport fix for #5674

Backports bits of 63880874
Not possible to forward-merge this due to conflicts
parent 408ed6ea
Branches
Tags 5.81.1
No related merge requests found
......@@ -72,8 +72,9 @@ class Run extends AbstractRunAction {
$sql = $queryObject->getSql();
$select = [];
foreach ($settings['columns'] as $col) {
$key = str_replace(':', '_', $col['key'] ?? '');
if (!empty($col['tally']['fn']) && \CRM_Utils_Rule::mysqlColumnNameOrAlias($key)) {
$key = $col['key'] ?? '';
$rawKey = str_replace(['.', ':'], '_', $key);
if (!empty($col['tally']['fn']) && \CRM_Utils_Rule::mysqlColumnNameOrAlias($rawKey)) {
/* @var \Civi\Api4\Query\SqlFunction $sqlFnClass */
$sqlFnClass = '\Civi\Api4\Query\SqlFunction' . $col['tally']['fn'];
$fnArgs = ["`$key`"];
......@@ -88,7 +89,7 @@ class Run extends AbstractRunAction {
$fnArgs[] = "ORDER BY `$key`";
}
}
$select[] = $sqlFnClass::renderExpression(implode(' ', $fnArgs)) . " `$key`";
$select[] = $sqlFnClass::renderExpression(implode(' ', $fnArgs)) . " `$rawKey`";
}
}
$query = 'SELECT ' . implode(', ', $select) . ' FROM (' . $sql . ') `api_query`';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment