1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb
index 4ae9920efb..a46afed7f4 100644
--- a/activerecord/lib/active_record/inheritance.rb
+++ b/activerecord/lib/active_record/inheritance.rb
@@ -51,7 +51,7 @@ module ActiveRecord
         end
 
         attrs = args.first
-        if attribute_names.include?(inheritance_column)
+        if has_attribute?(inheritance_column)
           subclass = subclass_from_attributes(attrs) || subclass_from_defaults
         end
 
@@ -163,7 +163,7 @@ module ActiveRecord
       end
 
       def using_single_table_inheritance?(record)
-        record[inheritance_column].present? && columns_hash.include?(inheritance_column)
+        record[inheritance_column].present? && has_attribute?(inheritance_column)
       end
 
       def find_sti_class(type_name)