From ae055428d5d135971f2b762e1a4d385471bffefa Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 26 Oct 2016 18:31:06 +0200 Subject: [PATCH] Bug 7679: Follow-up to fix group by hour Grouping by hour does not work with the collates. This patch removes them after talking to Julian on IRC. This partially reverts one of the earlier patches: Bug 7679: Display all table headers (case and accent sensitive) One could argue that this is more of a data problem, than something we should fix/'hide' with code. --- reports/issues_stats.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl index 25d2278..5c7370e 100755 --- a/reports/issues_stats.pl +++ b/reports/issues_stats.pl @@ -338,7 +338,7 @@ sub calculate { $linefilter[0] =~ s/\*/%/g; $strsth .= " AND $line LIKE ? "; } - $strsth .= " group by $linefield collate utf8_bin order by $lineorder "; + $strsth .= " group by $linefield order by $lineorder "; $debug and warn $strsth; push @loopfilter, { crit => 'SQL =', sql => 1, filter => $strsth }; my $sth = $dbh->prepare($strsth); @@ -427,7 +427,7 @@ sub calculate { $strsth2 .= " AND $column LIKE ? " ; } - $strsth2 .= " group by $colfield collate utf8_bin order by $colorder "; + $strsth2 .= " group by $colfield order by $colorder "; $debug and warn $strsth2; push @loopfilter, { crit => 'SQL =', sql => 1, filter => $strsth2 }; my $sth2 = $dbh->prepare($strsth2); @@ -556,7 +556,6 @@ sub calculate { } else { $strcalc .= " $colfield "; } - $strcalc .= " collate utf8_bin "; $strcalc .= " ORDER BY "; if($line_attribute_type) { -- 2.7.4