kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Rails5 Fix arel from

Browse source
This commit is contained in:
Jasper Maes 2018-06-02 01:52:15 +02:00
parent f8bd8f4f06
commit a91999e4fa
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/rails5-fix-46281.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Rails5 fix arel from
merge_request: 19340
author: Jasper Maes
type: fixed

9
lib/gitlab/database/median.rb
View file

@ -143,8 +143,13 @@ module Gitlab
.order(arel_table[column_sym])
).as('row_id')
count = arel_table.from(arel_table.alias)
.project('COUNT(*)')
arel_from = if Gitlab.rails5?
arel_table.from.from(arel_table.alias)
else
arel_table.from(arel_table.alias)
end
count = arel_from.project('COUNT(*)')
.where(arel_table[partition_column].eq(arel_table.alias[partition_column]))
.as('ct')