diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-07-21 08:13:31 +0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-21 08:19:53 +0800 |
| commit | fa8b290496789eb037d4fad89acea1cb0a534f35 (patch) | |
| tree | c4805af55d9e025860bfa23b582abb7c2c064621 /activerecord | |
| parent | f576d7cf848717384799a9e9669b253ccc94deb5 (diff) | |
| download | rails-fa8b290496789eb037d4fad89acea1cb0a534f35.tar.gz rails-fa8b290496789eb037d4fad89acea1cb0a534f35.tar.bz2 rails-fa8b290496789eb037d4fad89acea1cb0a534f35.zip | |
id is a public method
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 4 |
1 files changed, 2 insertions, 2 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 aba66d5a96..9ec63e3fca 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 @@ -49,9 +49,9 @@ module ActiveRecord attributes = columns.inject({}) do |attrs, column| case column.name.to_s when @reflection.primary_key_name.to_s - attrs[relation[column.name]] = @owner.send(:id) + attrs[relation[column.name]] = @owner.id when @reflection.association_foreign_key.to_s - attrs[relation[column.name]] = record.send(:id) + attrs[relation[column.name]] = record.id else if record.has_attribute?(column.name) value = @owner.send(:quote_value, record[column.name], column) |