1 files changed, 23 insertions, 1 deletions
diff --git a/lib/gitlab/usage/metrics/query.rb b/lib/gitlab/usage/metrics/query.rb
index f6947c4c8ff..851aa7a50e8 100644
--- a/lib/gitlab/usage/metrics/query.rb
+++ b/lib/gitlab/usage/metrics/query.rb
@@ -61,9 +61,31 @@ module Gitlab
           end
           # rubocop: enable CodeReuse/ActiveRecord
 
+          # rubocop: disable CodeReuse/ActiveRecord
           def raw_sql(relation, column, distinct = false)
             column ||= relation.primary_key
-            relation.select(relation.all.table[column].count(distinct)).to_sql
+            node = node_to_count(relation, column)
+
+            relation.unscope(:order).select(node.count(distinct)).to_sql
+          end
+          # rubocop: enable CodeReuse/ActiveRecord
+
+          def node_to_count(relation, column)
+            if join_relation?(relation) && joined_column?(column)
+              table_name, column_name = column.split(".")
+              Arel::Table.new(table_name)[column_name]
+            else
+              relation.all.table[column]
+            end
+          end
+
+          def join_relation?(relation)
+            relation.is_a?(ActiveRecord::Relation) && relation.joins_values.present?
+          end
+
+          # checks if the passed column is of format "table.column"
+          def joined_column?(column)
+            column.is_a?(String) && column.include?(".")
           end
         end
       end