aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-08-16 20:35:39 +0900
committerGitHub <noreply@github.com>2018-08-16 20:35:39 +0900
commit3ef3a921797c514ac48a019bfb229de200f1ba77 (patch)
treee3b2d374d67776bd1cfa5dce43d9d28d7ba969df /activemodel/lib/active_model
parent265eeb25592cccb1918641290c1b0259f700d02c (diff)
parent2fece9036d8ea778fca63a0d5df9a9dfc330dfa5 (diff)
downloadrails-3ef3a921797c514ac48a019bfb229de200f1ba77.tar.gz
rails-3ef3a921797c514ac48a019bfb229de200f1ba77.tar.bz2
rails-3ef3a921797c514ac48a019bfb229de200f1ba77.zip
Merge pull request #33603 from kamipo/fix_numericality_validator
Fix numericality validator not to be affected by custom getter
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/validations/numericality.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb
index 0478915be7..3753040316 100644
--- a/activemodel/lib/active_model/validations/numericality.rb
+++ b/activemodel/lib/active_model/validations/numericality.rb
@@ -23,6 +23,8 @@ module ActiveModel
if record.respond_to?(came_from_user) && record.public_send(came_from_user)
raw_value = record.read_attribute_before_type_cast(attr_name)
+ elsif record.respond_to?(:read_attribute)
+ raw_value = record.read_attribute(attr_name)
end
raw_value ||= value