diff options
| author | Carlos Kozuszko <carlos@insignia4u.com> | 2009-01-04 20:22:53 -0200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-01-16 10:00:39 +1300 |
| commit | c891d685de9a729332836751c1293770b86a1b52 (patch) | |
| tree | d17e38e746c52eca357e35892ec180236715495f | |
| parent | 9bcf01b23c25e640da7908ac8b1b49fbf7d2e51a (diff) | |
| download | rails-c891d685de9a729332836751c1293770b86a1b52.tar.gz rails-c891d685de9a729332836751c1293770b86a1b52.tar.bz2 rails-c891d685de9a729332836751c1293770b86a1b52.zip | |
Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1692 state:committed]
| -rw-r--r-- | activerecord/lib/active_record/dirty.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/dirty_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/dirty.rb b/activerecord/lib/active_record/dirty.rb index 4c899f58e5..4a2510aa63 100644 --- a/activerecord/lib/active_record/dirty.rb +++ b/activerecord/lib/active_record/dirty.rb @@ -151,8 +151,8 @@ module ActiveRecord def field_changed?(attr, old, value) if column = column_for_attribute(attr) - if column.type == :integer && column.null && (old.nil? || old == 0) && value.blank? - # For nullable integer columns, NULL gets stored in database for blank (i.e. '') values. + if column.number? && column.null && (old.nil? || old == 0) && value.blank? + # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values. # Hence we don't record it as a change if the value changes from nil to ''. # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll # be typecast back to 0 (''.to_i => 0) diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index 10cdbdc622..480a332ef7 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -58,7 +58,7 @@ class DirtyTest < ActiveRecord::TestCase assert_equal parrot.name_change, parrot.title_change end - def test_nullable_integer_not_marked_as_changed_if_new_value_is_blank + def test_nullable_number_not_marked_as_changed_if_new_value_is_blank pirate = Pirate.new ["", nil].each do |value| |