diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-04 11:58:56 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-06-04 11:58:56 +0000 |
| commit | 848ecbc7a608882517516045baf7d162f64e1ad1 (patch) | |
| tree | b96a9171d7ee4add989155123dc605d5820739ec | |
| parent | 23ae072ba2d601a3639a32f5a29302c430106bb8 (diff) | |
| parent | a91999e4faddbb5f5fc8e38548f4544ba6a41adf (diff) | |
| download | gitlab-ce-848ecbc7a608882517516045baf7d162f64e1ad1.tar.gz | |
Merge branch 'rails5-fix-46281' into 'master'
Rails5 fix arel from
Closes #46281
See merge request gitlab-org/gitlab-ce!19340
| -rw-r--r-- | changelogs/unreleased/rails5-fix-46281.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/database/median.rb | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/changelogs/unreleased/rails5-fix-46281.yml b/changelogs/unreleased/rails5-fix-46281.yml new file mode 100644 index 00000000000..ee0b8531988 --- /dev/null +++ b/changelogs/unreleased/rails5-fix-46281.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 fix arel from +merge_request: 19340 +author: Jasper Maes +type: fixed diff --git a/lib/gitlab/database/median.rb b/lib/gitlab/database/median.rb index 74fed447289..3cac007a42c 100644 --- a/lib/gitlab/database/median.rb +++ b/lib/gitlab/database/median.rb @@ -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') |