aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-12-24 10:23:19 +0000
committerJon Leighton <j@jonathanleighton.com>2011-12-24 11:08:16 +0000
commit0e3e34f0eba32ebc561f56e8eda22ed9b8ad76c7 (patch)
treead81a00d245f4fc2a3b81f6c5eba96febea6055d /activerecord/lib/active_record
parent15fbf5b58be386c8c5c02b06a4069c23cbcd5f0f (diff)
downloadrails-0e3e34f0eba32ebc561f56e8eda22ed9b8ad76c7.tar.gz
rails-0e3e34f0eba32ebc561f56e8eda22ed9b8ad76c7.tar.bz2
rails-0e3e34f0eba32ebc561f56e8eda22ed9b8ad76c7.zip
Support nested AR::Models
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/model_schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 08f3451254..adf85c6436 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -291,7 +291,7 @@ module ActiveRecord
base = base_class
if self == base
# Nested classes are prefixed with singular parent table name.
- if parent < ActiveRecord::Base && !parent.abstract_class?
+ if parent < ActiveRecord::Model && !parent.abstract_class?
contained = parent.table_name
contained = contained.singularize if parent.pluralize_table_names
contained += '_'