diff options
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 8b471859c1..8d82de0d01 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -3,7 +3,6 @@ module ActiveRecord class HasManyAssociation < AssociationCollection #:nodoc: def initialize(owner, reflection) super - @conditions = sanitize_sql(reflection.options[:conditions]) construct_sql end @@ -169,11 +168,11 @@ module ActiveRecord @finder_sql = "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_id = #{@owner.quoted_id} AND " + "#{@reflection.klass.table_name}.#{@reflection.options[:as]}_type = #{@owner.class.quote @owner.class.base_class.name.to_s}" - @finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions + @finder_sql << " AND (#{conditions})" if conditions else @finder_sql = "#{@reflection.klass.table_name}.#{@reflection.primary_key_name} = #{@owner.quoted_id}" - @finder_sql << " AND (#{interpolate_sql(@conditions)})" if @conditions + @finder_sql << " AND (#{conditions})" if conditions end if @reflection.options[:counter_sql] |