diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/validations.rb | 1 | ||||
| -rwxr-xr-x | activerecord/test/validations_test.rb | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 05c616e95f..64b11e2e8d 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 [raidel@onemail.at] + * Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [michael@schuerig.de] * Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 [DeLynn Berry] diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb index fb207ef4b2..d2bd5b6511 100755 --- a/activerecord/lib/active_record/validations.rb +++ b/activerecord/lib/active_record/validations.rb @@ -619,6 +619,7 @@ module ActiveRecord end else validates_each(attr_names,configuration) do |record, attr_name,value| + next if configuration[:allow_nil] and record.send("#{attr_name}_before_type_cast").nil? begin Kernel.Float(record.send("#{attr_name}_before_type_cast").to_s) rescue ArgumentError, TypeError diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb index 8a918e2255..afd11c6d62 100755 --- a/activerecord/test/validations_test.rb +++ b/activerecord/test/validations_test.rb @@ -319,6 +319,13 @@ class ValidationsTest < Test::Unit::TestCase assert Topic.create("title" => nil, "content" => "abc").valid? end + def test_numericality_with_allow_nil_and_getter_method + Developer.validates_numericality_of( :salary, :allow_nil => true) + developer = Developer.new("name" => "michael", "salary" => nil) + developer.instance_eval("def salary; read_attribute('salary') ? read_attribute('salary') : 100000; end") + assert developer.valid? + end + def test_validates_exclusion_of Topic.validates_exclusion_of( :title, :in => %w( abe monkey ) ) |