Merge pull request #15839 from sgrif/sg-attr-set-null

Return a null object from `AttributeSet#[]`

3 files changed, 4 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
index d057f0941a..9ee9a7815f 100644
--- a/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
+++ b/activerecord/lib/active_record/attribute_methods/before_type_cast.rb
@@ -43,9 +43,7 @@ module ActiveRecord
       #   task.read_attribute_before_type_cast('completed_on') # => "2012-10-21"
       #   task.read_attribute_before_type_cast(:completed_on)  # => "2012-10-21"
       def read_attribute_before_type_cast(attr_name)
-        if attr = @attributes[attr_name.to_s]
-          attr.value_before_type_cast
-        end
+        @attributes[attr_name.to_s].value_before_type_cast
       end
 
       # Returns a hash of attributes before typecasting and deserialization.
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index ca71834641..e1a86fd3aa 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -129,7 +129,7 @@ module ActiveRecord
       end
 
       def _field_changed?(attr, old_value)
-        attribute_named(attr).changed_from?(old_value)
+        @attributes[attr].changed_from?(old_value)
       end
 
       def changed_in_place
@@ -140,7 +140,7 @@ module ActiveRecord
 
       def changed_in_place?(attr_name)
         old_value = original_raw_attribute(attr_name)
-        attribute_named(attr_name).changed_in_place_from?(old_value)
+        @attributes[attr_name].changed_in_place_from?(old_value)
       end
 
       def original_raw_attribute(attr_name)
@@ -154,7 +154,7 @@ module ActiveRecord
       end
 
       def store_original_raw_attribute(attr_name)
-        original_raw_attributes[attr_name] = attribute_named(attr_name).value_for_database
+        original_raw_attributes[attr_name] = @attributes[attr_name].value_for_database
       end
 
       def store_original_raw_attributes
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 525c46970a..8c1cc128f7 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -99,10 +99,6 @@ module ActiveRecord
       def attribute(attribute_name)
         read_attribute(attribute_name)
       end
-
-      def attribute_named(attribute_name)
-        @attributes.fetch(attribute_name, Attribute::Null)
-      end
     end
   end
 end