#434

backend/app/services/counts_table_query.rb

@@ -88,7 +88,7 @@ class CountsTableQuery
             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 + ['COUNT(DISTINCT v.id) AS count']).join(', ')))
+                .select(Arel.sql((selected + ["#{ axes.count_expression } AS count"]).join(', ')))
                 .to_sql
           end
     prefix = "WITH cells AS (#{ sql })"
@@ -359,7 +359,7 @@ class CountsTableQuery
     end
     selected = row_expressions.each_with_index.map { |expression, index|
       "#{ expression } AS a#{ index }"
-    } + ['COUNT(DISTINCT v.id) AS count']
+    } + ["#{ 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
   end