diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-29 22:50:12 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-29 22:50:12 -0300 |
commit | 1f190b7ceb7dabbfd6b7b14fe48ed79bcc3a83fd (patch) | |
tree | 3a8ee885db4d2cf8f9584817fc44406cf9de39ab /activerecord/lib/active_record/core.rb | |
parent | 74cec956e80611df621c9d831696e3b59c65e482 (diff) | |
parent | 9e368a5030728f054589efc3a0acc0f68265851b (diff) | |
download | rails-1f190b7ceb7dabbfd6b7b14fe48ed79bcc3a83fd.tar.gz rails-1f190b7ceb7dabbfd6b7b14fe48ed79bcc3a83fd.tar.bz2 rails-1f190b7ceb7dabbfd6b7b14fe48ed79bcc3a83fd.zip |
Merge pull request #15981 from sgrif/sg-simplify-defaults
Simplify creation of default attributes on AR instance
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r-- | activerecord/lib/active_record/core.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 3321e268d5..224112b559 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -248,12 +248,7 @@ module ActiveRecord # # Instantiates a single new object # User.new(first_name: 'Jamie') def initialize(attributes = nil, options = {}) - defaults = {} - self.class.raw_column_defaults.each do |k, v| - defaults[k] = v.duplicable? ? v.dup : v - end - - @attributes = self.class.attributes_builder.build_from_database(defaults) + @attributes = self.class.default_attributes.dup init_internals initialize_internals_callback |