diff options
| author | Ernie Miller <ernie@metautonomo.us> | 2011-01-06 20:06:29 -0500 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-11 09:19:19 -0800 |
| commit | 7d4d7457301faa85aa32b5ae29e13976e828954f (patch) | |
| tree | 52695a0758fff2582736d08e672a3240b76b02f2 /activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb | |
| parent | a60ea742226f09dc566ad5d9a0b465c5d5db9687 (diff) | |
| download | rails-7d4d7457301faa85aa32b5ae29e13976e828954f.tar.gz rails-7d4d7457301faa85aa32b5ae29e13976e828954f.tar.bz2 rails-7d4d7457301faa85aa32b5ae29e13976e828954f.zip | |
Fix polymorphic belongs_to associationproxy raising errors when loading target.
Diffstat (limited to 'activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb index 4f67b02d00..cae35fe0d0 100644 --- a/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb +++ b/activerecord/lib/active_record/associations/belongs_to_polymorphic_association.rb @@ -4,6 +4,11 @@ module ActiveRecord class BelongsToPolymorphicAssociation < BelongsToAssociation #:nodoc: private + def conditions + @conditions ||= interpolate_sql(target_klass.send(:sanitize_sql, @reflection.options[:conditions])) if @reflection.options[:conditions] + end + alias :sql_conditions :conditions + def replace_keys(record) super @owner[@reflection.foreign_type] = record && record.class.base_class.name |