summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics/inc/hardwarequery.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-06 16:11:55 +0200
committerSimon Rettberg2022-07-06 16:11:55 +0200
commit8355096282c0b1491416111ae5ff35aba4bf5b70 (patch)
tree1f50f4c0bd0e389fd97d32f8ef32edd10557108f /modules-available/statistics/inc/hardwarequery.inc.php
parent[permissionmanager] Shorten permissionid to 100 chars (diff)
downloadslx-admin-8355096282c0b1491416111ae5ff35aba4bf5b70.tar.gz
slx-admin-8355096282c0b1491416111ae5ff35aba4bf5b70.tar.xz
slx-admin-8355096282c0b1491416111ae5ff35aba4bf5b70.zip
[statistics] Fix problems with unusual column names in query builder
Diffstat (limited to 'modules-available/statistics/inc/hardwarequery.inc.php')
-rw-r--r--modules-available/statistics/inc/hardwarequery.inc.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/modules-available/statistics/inc/hardwarequery.inc.php b/modules-available/statistics/inc/hardwarequery.inc.php
index e458599d..4f0ec344 100644
--- a/modules-available/statistics/inc/hardwarequery.inc.php
+++ b/modules-available/statistics/inc/hardwarequery.inc.php
@@ -136,6 +136,11 @@ class HardwareQuery
} elseif (!is_array($groupBy)) {
$groupBy = [$groupBy];
}
+ foreach ($groupBy as &$gb) {
+ if ($gb[0] !== '`') {
+ $gb = "`$gb`";
+ }
+ }
$columns = [];
foreach ($this->columns as $column) {
if ($column instanceof HardwareQueryColumn) {
@@ -154,7 +159,7 @@ class HardwareQuery
}
if (!empty($groupBy)) {
$columns[] = 'Count(*) AS group_count';
- $groupBy = " GROUP BY `" . implode('`, `', $groupBy) . '`';
+ $groupBy = " GROUP BY " . implode(', ', $groupBy);
} else {
$groupBy = '';
}