From d1abadb181c88ebaa4bce1916f9077469d4ea2bc Mon Sep 17 00:00:00 2001 From: Christian F Date: Mon, 6 Mar 2023 14:06:07 +0100 Subject: [PATCH] [Task] Optimized custom reports filter (#14526) * optimized custom reports filter * Update models/Tool/CustomReport/Adapter/Sql.php Co-authored-by: Jacob Dreesen --------- Co-authored-by: Jacob Dreesen --- models/Tool/CustomReport/Adapter/Sql.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/Tool/CustomReport/Adapter/Sql.php b/models/Tool/CustomReport/Adapter/Sql.php index e49426c59a0..ffb40108c7f 100644 --- a/models/Tool/CustomReport/Adapter/Sql.php +++ b/models/Tool/CustomReport/Adapter/Sql.php @@ -38,7 +38,8 @@ public function getData($filters, $sort, $dir, $offset, $limit, $fields = null, $order = ''; if ($sort && $dir) { - $order = ' ORDER BY ' . $db->quoteIdentifier($sort) . ' ' . $dir; + $dir = ((strtoupper($dir) === 'ASC') ? 'ASC' : 'DESC'); + $order = ' ORDER BY ' . $db->quoteIdentifier($sort) . ' ' .$dir; } $sql = $baseQuery['data'] . $order; @@ -125,7 +126,7 @@ protected function buildQueryString($config, $ignoreSelectAndGroupBy = false, $d $db = Db::get(); foreach ($drillDownFilters as $field => $value) { if ($value !== '' && $value !== null) { - $havingParts[] = "$field = " . $db->quote($value); + $havingParts[] = ($db->quoteIdentifier($field) ." = " . $db->quote($value)); } }