diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-24 17:15:46 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-08-25 05:17:49 -0700 |
| commit | e1e712227197bcfb9564113eb3dd8ef6ffac243f (patch) | |
| tree | ace18997da1d4ea99b5c76f6b7c68c1fda72808d | |
| parent | 4f945e97e55b861ab014d71efa983ab183441031 (diff) | |
| download | rails-e1e712227197bcfb9564113eb3dd8ef6ffac243f.tar.gz rails-e1e712227197bcfb9564113eb3dd8ef6ffac243f.tar.bz2 rails-e1e712227197bcfb9564113eb3dd8ef6ffac243f.zip | |
mark SQL literals as SQL literals
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index e983f86f9e..c0ec65bd40 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -26,7 +26,7 @@ module ActiveRecord def construct_find_options!(options) options[:joins] = Arel::SqlLiteral.new @join_sql options[:readonly] = finding_with_ambiguous_select?(options[:select] || @reflection.options[:select]) - options[:select] ||= (@reflection.options[:select] || '*') + options[:select] ||= (@reflection.options[:select] || Arel::SqlLiteral.new('*')) end def count_records |