Skip to content

Commit 404ce7e

Browse files
Merge pull request rails#49911 from a5-stable/active_record_base_table_name
return nil for `ActiveRecord::Base.table_name`
2 parents 2b5851a + 81e4ff6 commit 404ce7e

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

activerecord/lib/active_record/model_schema.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ def quoted_table_name
284284

285285
# Computes the table name, (re)sets it internally, and returns it.
286286
def reset_table_name # :nodoc:
287-
self.table_name = if abstract_class?
288-
superclass == Base ? nil : superclass.table_name
287+
self.table_name = if self == Base
288+
nil
289+
elsif abstract_class?
290+
superclass.table_name
289291
elsif superclass.abstract_class?
290292
superclass.table_name || compute_table_name
291293
else

activerecord/test/cases/base_test.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,10 @@ def test_table_name_based_on_model_name
524524
assert_equal "posts", PostRecord.table_name
525525
end
526526

527+
def test_table_name_for_base_class
528+
assert_nil ActiveRecord::Base.table_name
529+
end
530+
527531
def test_null_fields
528532
assert_nil Topic.find(1).parent_id
529533
assert_nil Topic.create("title" => "Hey you").parent_id

0 commit comments

Comments
 (0)