diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
| commit | efd0bd3b7390ebb8526b981169025f2860f6a113 (patch) | |
| tree | 1cb3bcd8f9534f64e8a764af1010ce65303b42b0 /activerecord/lib/active_record/attribute_methods/write.rb | |
| parent | f4571e3617ccd9cc9e5ee9f7431066bd80395e22 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.gz rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.bz2 rails-efd0bd3b7390ebb8526b981169025f2860f6a113.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/write.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/write.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb index 37eadbe0a9..e31acac050 100644 --- a/activerecord/lib/active_record/attribute_methods/write.rb +++ b/activerecord/lib/active_record/attribute_methods/write.rb @@ -17,9 +17,14 @@ module ActiveRecord # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+. Empty strings for fixnum and float # columns are turned into +nil+. def write_attribute(attr_name, value) - attr_name = _attributes.unalias(attr_name) + attr_name = attr_name.to_s + attr_name = self.class.primary_key if attr_name == 'id' @attributes_cache.delete(attr_name) - _attributes[attr_name] = value + if (column = column_for_attribute(attr_name)) && column.number? + @attributes[attr_name] = convert_number_column_value(value) + else + @attributes[attr_name] = value + end end private |