Merge pull request #49911 from a5-stable/active_record_base_table_name

jonathanhefner · jonathanhefner · commit 5e0165a3352f · 2023-11-04T12:22:12.000-05:00
return nil for `ActiveRecord::Base.table_name` (cherry picked from commit 404ce7e)
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   `ActiveRecord::Base.table_name` now returns `nil` instead of raising
+    "undefined method `abstract_class?` for Object:Class".
+
+    *a5-stable*
+
 *   Fix upserting for custom `:on_duplicate` and `:unique_by` consisting of all
     inserts keys.
 
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
@@ -276,8 +276,10 @@ def quoted_table_name
 
       # Computes the table name, (re)sets it internally, and returns it.
       def reset_table_name # :nodoc:
-        self.table_name = if abstract_class?
-          superclass == Base ? nil : superclass.table_name
+        self.table_name = if self == Base
+          nil
+        elsif abstract_class?
+          superclass.table_name
         elsif superclass.abstract_class?
           superclass.table_name || compute_table_name
         else
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
@@ -497,6 +497,10 @@ def test_table_name_based_on_model_name
     assert_equal "posts", PostRecord.table_name
   end
 
+  def test_table_name_for_base_class
+    assert_nil ActiveRecord::Base.table_name
+  end
+
   def test_null_fields
     assert_nil Topic.find(1).parent_id
     assert_nil Topic.create("title" => "Hey you").parent_id
