diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-27 13:26:20 -0500 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-01-27 13:26:20 -0500 |
| commit | 77383fc1e473819971d1e3ca614d7b361fa5cc33 (patch) | |
| tree | 6e81f97075d4aef0083b9c2f8249ba24cdf78510 /activerecord/lib | |
| parent | 9864bcee8cfdb9e798473e01936b4499e268a64d (diff) | |
| download | rails-77383fc1e473819971d1e3ca614d7b361fa5cc33.tar.gz rails-77383fc1e473819971d1e3ca614d7b361fa5cc33.tar.bz2 rails-77383fc1e473819971d1e3ca614d7b361fa5cc33.zip | |
Do not use default attributes for STI when instantiating a subclass
The commit which originally added this behavior did not consider that
doing `Subclass.new` does not actually populate the `type` field in the
attributes (though perhaps it should). We simply need to not use the
defaults for STI related things unless we are instantiating the base
class.
Fixes #23285.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/inheritance.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb index 3a17f74b1d..3b6fb70d0d 100644 --- a/activerecord/lib/active_record/inheritance.rb +++ b/activerecord/lib/active_record/inheritance.rb @@ -52,7 +52,11 @@ module ActiveRecord attrs = args.first if has_attribute?(inheritance_column) - subclass = subclass_from_attributes(attrs) || subclass_from_attributes(column_defaults) + subclass = subclass_from_attributes(attrs) + + if subclass.nil? && base_class == self + subclass = subclass_from_attributes(column_defaults) + end end if subclass && subclass != self |