diff options
| -rw-r--r-- | changelogs/unreleased/rails5-fix-mysql-arel-from.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/database/median.rb | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/changelogs/unreleased/rails5-fix-mysql-arel-from.yml b/changelogs/unreleased/rails5-fix-mysql-arel-from.yml new file mode 100644 index 00000000000..9883ff306f1 --- /dev/null +++ b/changelogs/unreleased/rails5-fix-mysql-arel-from.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 fix arel from in mysql_median_datetime_sql +merge_request: 20167 +author: Jasper Maes +type: fixed 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( |