#434

backend/app/services/counts_table_query.rb

@@ -84,19 +84,9 @@ class CountsTableQuery
           cells: page == 1 ? [{ values: [], count: record_counts[:visible] }] : [],
           axis_labels: {} }
     end
-    expressions = axes.expressions
-    selected = expressions.each_with_index.map do |expression, index|
-      "#{ expression } AS a#{ index }"
-    end
     source = summary_population.scope
     source = source.joins(axes.joins) unless axes.joins.empty?
-    sql = if expressions.empty?
-            source.except(:select).select('COUNT(DISTINCT v.id) AS count').to_sql
-          else
-            source.except(:select).group(*expressions.map { Arel.sql(_1) })
-                .select(Arel.sql((selected + ["#{ axes.count_expression } AS count"]).join(', ')))
-                .to_sql
-          end
+    sql = axes.grouped_sql(source)
     prefix = "WITH cells AS (#{ sql })"
     column_values = limited_columns(prefix)
     row_keys = axes.rows.each_index.map { "a#{ _1 }" }
@@ -354,7 +344,6 @@ class CountsTableQuery
   end
 
   def measure_relation values
-    row_expressions = axes.expressions.first(axes.rows.length)
     source = summary_population.scope.except(:select, :order)
     # Omitted multi-value column axes still determine full-cell membership.
     membership = summary_population.scope.except(:select, :order)
@@ -368,11 +357,7 @@ class CountsTableQuery
       expression = axes.expressions[axes.rows.length + index]
       source = source.where("(#{ expression }) <=> ?", value)
     end
-    selected = row_expressions.each_with_index.map { |expression, index|
-      "#{ expression } AS a#{ index }"
-    } + ["#{ axes.count_expression } AS count"]
-    source = source.group(*row_expressions.map { Arel.sql(_1) }) if row_expressions.any?
-    source.select(Arel.sql(selected.join(', '))).to_sql
+    axes.grouped_sql(source, axes.rows.each_index.to_a)
   end
 
   def axis_order_sql key, direction = 'asc', qualifier: nil