#434

backend/app/services/counts_pivot_totals.rb

@@ -41,32 +41,25 @@ class CountsPivotTotals
           }.join(' AND ') }.map { "(#{ _1 })" }.join(' OR ')
           scope = scope.where(predicate, *tuples.flatten)
         end
-        grouped = expressions.each_with_index.map { |expression, index|
-          "#{ expression } AS v#{ index }"
+        grouped = indexes.each_with_index.map { |key, index|
+          "a#{ key } AS v#{ index }"
         }
         # Fixed-width result coordinates, independent of NULL and of translated labels.
         padding = (expressions.length...@axes.all.length).map { "NULL AS v#{ _1 }" }
         fields = ["#{ row_depth } AS row_depth", "#{ column_depth } AS column_depth"] +
-            grouped + padding + ['COUNT(DISTINCT v.id) AS count']
+            grouped + padding + ['count']
         if additive
           # Sum full row tuples, not page cells; preserve DISTINCT inside each tuple.
-          leaf = retained.map { @axes.expressions[_1] }
-          selected = leaf.each_with_index.map do |expression, index|
-            "#{ expression } AS k#{ index }"
-          end
-          selected << "#{ @axes.count_expression } AS count"
-          inner = scope.group(*leaf.map { Arel.sql(_1) })
-              .select(Arel.sql(selected.join(', '))).to_sql
-          coordinates = indexes.map { "k#{ retained.index(_1) }" }
+          inner = @axes.grouped_sql(scope, retained)
+          coordinates = indexes.map { "a#{ _1 }" }
           projected = coordinates.each_with_index.map { |key, index| "#{ key } AS v#{ index }" }
           output = ["#{ row_depth } AS row_depth", "#{ column_depth } AS column_depth"] +
               projected + padding + ['SUM(count) AS count']
           grouping = coordinates.empty? ? '' : " GROUP BY #{ coordinates.join(', ') }"
           "SELECT #{ output.join(', ') } FROM (#{ inner }) leaf#{ grouping }"
         else
-          scope = scope.group(*expressions.map { Arel.sql(_1) }) if expressions.any?
-          scope.optimizer_hints('MAX_EXECUTION_TIME(10000)')
-              .select(Arel.sql(fields.join(', '))).to_sql
+          inner = @axes.grouped_sql(scope, indexes)
+          "SELECT #{ fields.join(', ') } FROM (#{ inner }) grouped"
         end
       end
     end