don't rely on the columns hash to get defaults. follow-up to #17169.

This will also get the defaults from attribute definitions like:

     attribute :type, :string, default: "SomethingElse"

1 files changed, 1 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb
index a46afed7f4..e094735799 100644
--- a/activerecord/lib/active_record/inheritance.rb
+++ b/activerecord/lib/active_record/inheritance.rb
@@ -52,7 +52,7 @@ module ActiveRecord
 
         attrs = args.first
         if has_attribute?(inheritance_column)
-          subclass = subclass_from_attributes(attrs) || subclass_from_defaults
+          subclass = subclass_from_attributes(attrs) || subclass_from_attributes(column_defaults)
         end
 
         if subclass && subclass != self
@@ -207,12 +207,6 @@ module ActiveRecord
           end
         end
       end
-
-      def subclass_from_defaults
-        if default = columns_hash[inheritance_column].default
-          find_sti_class(default)
-        end
-      end
     end
 
     def initialize_dup(other)