From 6a1ea881cf56c4b0ccd35cbb7549d2e70f7755ff Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 23 Aug 2010 14:27:16 -0700 Subject: [PATCH] we should mark sql strings as sql literals --- activerecord/lib/active_record/association_preload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 5ac89a93c2..b1b563c95f 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -372,7 +372,7 @@ module ActiveRecord conditions << append_conditions(reflection, preload_options) find_options = { - :select => preload_options[:select] || options[:select] || "#{table_name}.*", + :select => preload_options[:select] || options[:select] || Arel::SqlLiteral.new("#{table_name}.*"), :include => preload_options[:include] || options[:include], :conditions => [conditions, ids], :joins => options[:joins],