Extract common logic into a method

1 files changed, 5 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 5fd0b12706..5754806cdd 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -128,10 +128,10 @@ module ActiveRecord
 
       # Computes the table name, (re)sets it internally, and returns it.
       def reset_table_name #:nodoc:
-        if (superclass < ActiveRecord::Model) && superclass.abstract_class?
-          self.table_name = superclass.table_name || compute_table_name
+        if active_record_super.abstract_class?
+          self.table_name = active_record_super.table_name || compute_table_name
         elsif abstract_class?
-          self.table_name = superclass == Base ? nil : superclass.table_name
+          self.table_name = active_record_super == Base ? nil : active_record_super.table_name
         else
           self.table_name = compute_table_name
         end
@@ -143,10 +143,10 @@ module ActiveRecord
 
       # The name of the column containing the object's class when Single Table Inheritance is used
       def inheritance_column
-        if self == Base || !(superclass < Model)
+        if self == Base
           'type'
         else
-          (@inheritance_column ||= nil) || superclass.inheritance_column
+          (@inheritance_column ||= nil) || active_record_super.inheritance_column
         end
       end