diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-18 23:35:25 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-24 11:08:15 +0000 |
| commit | 6af7192af59602e1cbb341b8bf3452afb344eff2 (patch) | |
| tree | 7e02050aedff7fbd8cb916b20b9a27f71a0a559f /activerecord/lib/active_record/model_schema.rb | |
| parent | b2c9ce341a1c907041f55461aefebb0321280cb5 (diff) | |
| download | rails-6af7192af59602e1cbb341b8bf3452afb344eff2.tar.gz rails-6af7192af59602e1cbb341b8bf3452afb344eff2.tar.bz2 rails-6af7192af59602e1cbb341b8bf3452afb344eff2.zip | |
I herd you like modules.
Diffstat (limited to 'activerecord/lib/active_record/model_schema.rb')
| -rw-r--r-- | activerecord/lib/active_record/model_schema.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb index 1de820b3a6..5fd0b12706 100644 --- a/activerecord/lib/active_record/model_schema.rb +++ b/activerecord/lib/active_record/model_schema.rb @@ -128,7 +128,7 @@ module ActiveRecord # Computes the table name, (re)sets it internally, and returns it. def reset_table_name #:nodoc: - if superclass.abstract_class? + if (superclass < ActiveRecord::Model) && superclass.abstract_class? self.table_name = superclass.table_name || compute_table_name elsif abstract_class? self.table_name = superclass == Base ? nil : superclass.table_name @@ -143,7 +143,7 @@ module ActiveRecord # The name of the column containing the object's class when Single Table Inheritance is used def inheritance_column - if self == Base + if self == Base || !(superclass < Model) 'type' else (@inheritance_column ||= nil) || superclass.inheritance_column |