diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-26 00:25:21 +0200 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-06-26 00:35:47 +0200 |
| commit | faf94535fba271e221b7b430a04b794241582cbf (patch) | |
| tree | b465c29739dab8cc85b0b6bb8f820bc6153f18b9 /lib/gitlab/database | |
| parent | 0139c221e41aee1bd021f08f8207df6ccac033b1 (diff) | |
| download | gitlab-ce-faf94535fba271e221b7b430a04b794241582cbf.tar.gz | |
Rails5 fix arel from in mysql_median_datetime_sql
Diffstat (limited to 'lib/gitlab/database')
| -rw-r--r-- | lib/gitlab/database/median.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/database/median.rb b/lib/gitlab/database/median.rb index 3cac007a42c..f64e3d53138 100644 --- a/lib/gitlab/database/median.rb +++ b/lib/gitlab/database/median.rb @@ -33,7 +33,13 @@ module Gitlab end def mysql_median_datetime_sql(arel_table, query_so_far, column_sym) - query = arel_table + arel_from = if Gitlab.rails5? + arel_table.from + else + arel_table + end + + query = arel_from .from(arel_table.project(Arel.sql('*')).order(arel_table[column_sym]).as(arel_table.table_name)) .project(average([arel_table[column_sym]], 'median')) .where( |