summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-10-12 09:45:22 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-12 11:36:55 +0200
commit92ed1fecdcc621b7940466becb4d10de56ec20f2 (patch)
tree2b77aab515c74ef890c88a288a3da9b7e0d3fd58
parentd2a9d95a2237aa3d6a93be5df012838180b704b7 (diff)
downloadgitlab-ce-92ed1fecdcc621b7940466becb4d10de56ec20f2.tar.gz
Update preloaded count queries for MySQL
-rw-r--r--app/models/concerns/loaded_in_group_list.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/loaded_in_group_list.rb b/app/models/concerns/loaded_in_group_list.rb
index 3dacfdf92e7..dcb3b2b5ff3 100644
--- a/app/models/concerns/loaded_in_group_list.rb
+++ b/app/models/concerns/loaded_in_group_list.rb
@@ -5,9 +5,9 @@ module LoadedInGroupList
def with_counts(archived:)
selects_including_counts = [
'namespaces.*',
- "(#{project_count_sql(archived).to_sql})",
- "(#{subgroup_count_sql.to_sql})",
- "(#{member_count_sql.to_sql})"
+ "(#{project_count_sql(archived).to_sql}) AS preloaded_project_count",
+ "(#{member_count_sql.to_sql}) AS preloaded_member_count",
+ "(#{subgroup_count_sql.to_sql}) AS preloaded_subgroup_count"
]
select(selects_including_counts)