From 27c6c071165342c770ed9c697024aa101dad4049 Mon Sep 17 00:00:00 2001 From: Bart de Water Date: Sat, 28 Jul 2018 19:17:15 -0400 Subject: Fix TypeError: no implicit conversion of Arel::Attributes::Attribute into String --- activerecord/lib/active_record/relation/calculations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 3c45462f46..40fe39fa9d 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -245,7 +245,7 @@ module ActiveRecord if distinct && (group_values.any? || select_values.empty? && order_values.empty?) column_name = primary_key end - elsif /\s*DISTINCT[\s(]+/i.match?(column_name) + elsif /\s*DISTINCT[\s(]+/i.match?(column_name.to_s) distinct = nil end end -- cgit v1.2.3