Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name. Closes #5911.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 16 insertions, 7 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d98629e289..346f6549f1 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -610,13 +610,22 @@ module ActiveRecord #:nodoc:
       end
 
       def reset_table_name #:nodoc:
-        # If this is a nested class, prefix with singular parent table name.
-        if parent < ActiveRecord::Base && !parent.abstract_class?
-          contained = parent.table_name
-          contained = contained.singularize if parent.pluralize_table_names
-          contained << '_'
-        end
-        name = "#{table_name_prefix}#{contained}#{undecorated_table_name(base_class.name)}#{table_name_suffix}"
+        base = base_class
+
+        name =
+          # STI subclasses always use their superclass' table.
+          unless self == base
+            base.table_name
+          else
+            # Nested classes are prefixed with singular parent table name.
+            if parent < ActiveRecord::Base && !parent.abstract_class?
+              contained = parent.table_name
+              contained = contained.singularize if parent.pluralize_table_names
+              contained << '_'
+            end
+            name = "#{table_name_prefix}#{contained}#{undecorated_table_name(base.name)}#{table_name_suffix}"
+          end
+
         set_table_name(name)
         name
       end