Skip to content

Commit

Permalink
Do not consider the numeric attribute as changed if the old value is
Browse files Browse the repository at this point in the history
zero and the new value is not a string.

Before this commit this was the behavior

r = Review.find_by_issue(0)
r.issue
=> 0
r.changes
=> {}
r.issue = 0
=> 0
r.changed?
=> true
r.changes
=> {"issue"=>[0,0]}

Fixes rails#7237
  • Loading branch information
rafaelfranca authored and spastorino committed Aug 2, 2012
1 parent 5c42889 commit 55e05d4
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
6 changes: 6 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 3.2.8 ##

* Do not consider the numeric attribute as changed if the old value is zero and the new value
is not a string.
Fixes #7237.

*Rafael Mendonça França*

* Removes the deprecation of `update_attribute`. *fxn*

* Reverted the deprecation of `composed_of`. *Rafael Mendonça França*
Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/attribute_methods/dirty.rb
Expand Up @@ -104,7 +104,7 @@ def changes_from_nil_to_empty_string?(column, old, value)

def changes_from_zero_to_string?(old, value)
# For columns with old 0 and value non-empty string
old == 0 && value.present? && value != '0'
old == 0 && value.is_a?(String) && value.present? && value != '0'
end
end
end
Expand Down
15 changes: 14 additions & 1 deletion activerecord/test/cases/dirty_test.rb
Expand Up @@ -201,7 +201,7 @@ def test_nullable_float_not_marked_as_changed_if_new_value_is_blank
end
end

def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
def test_integer_zero_to_string_zero_not_marked_as_changed
pirate = Pirate.new
pirate.parrot_id = 0
pirate.catchphrase = 'arrr'
Expand All @@ -213,6 +213,19 @@ def test_nullable_integer_zero_to_string_zero_not_marked_as_changed
assert !pirate.changed?
end

def test_integer_zero_to_integer_zero_not_marked_as_changed
pirate = Pirate.new
pirate.parrot_id = 0
pirate.catchphrase = 'arrr'
assert pirate.save!

assert !pirate.changed?

pirate.parrot_id = 0
assert !pirate.changed?
end


def test_zero_to_blank_marked_as_changed
pirate = Pirate.new
pirate.catchphrase = "Yarrrr, me hearties"
Expand Down

0 comments on commit 55e05d4

Please sign in to comment.