From 5a6ad511865df4a849afe47e1be8a3f250f658f0 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Fri, 1 May 2020 22:28:26 +0900 Subject: [PATCH] Should not rely on the global `Arel::Table.engine` in the framework Follow up to https://github.com/rails/rails/commit/bc99e40. --- .../connection_adapters/oracle_enhanced_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb index de0b93721..40340b09d 100644 --- a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb +++ b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb @@ -655,7 +655,7 @@ def columns_for_distinct(columns, orders) #:nodoc: # # It does not construct DISTINCT clause. Just return column names for distinct. order_columns = orders.reject(&:blank?).map { |s| - s = s.to_sql unless s.is_a?(String) + s = visitor.compile(s) unless s.is_a?(String) # remove any ASC/DESC modifiers s.gsub(/\s+(ASC|DESC)\s*?/i, "") }.reject(&:blank?).map.with_index { |column, i|