From 8d9f7b5b9987cccd392442b92c3945fc20a12fff Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 28 Sep 2010 17:31:31 -0700 Subject: SqlLiteral is a string, so we can dry up these conditionals --- activerecord/lib/active_record/relation/query_methods.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 762ae8e2a4..182c293d30 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -176,11 +176,10 @@ module ActiveRecord (@where_values - ['']).uniq.each do |where| case where - when Arel::SqlLiteral - arel = arel.where(where) + when String + arel = arel.where(Arel.sql("(#{where})")) else - sql = where.is_a?(String) ? where : where.to_sql(table.engine) - arel = arel.where(Arel::SqlLiteral.new("(#{sql})")) + arel = arel.where(Arel::Nodes::Grouping.new(where)) end end -- cgit v1.2.3