From faf94535fba271e221b7b430a04b794241582cbf Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Tue, 26 Jun 2018 00:25:21 +0200 Subject: Rails5 fix arel from in mysql_median_datetime_sql --- lib/gitlab/database/median.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/gitlab/database') 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( -- cgit v1.2.1