diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-06-25 23:42:35 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-06-25 23:42:35 -0700 |
| commit | 63d4894a58825e9d1fb520ec6ac663e4d8529596 (patch) | |
| tree | f2648ea726d1096975b0470f7ca1d70947899982 /activerecord/lib | |
| parent | cacfa8e3fb2cff59956a39a2640c8e3ade4b54c6 (diff) | |
| parent | 839efc5b6d754697682d5b2bd34ef28b2c5d2adf (diff) | |
| download | rails-63d4894a58825e9d1fb520ec6ac663e4d8529596.tar.gz rails-63d4894a58825e9d1fb520ec6ac663e4d8529596.tar.bz2 rails-63d4894a58825e9d1fb520ec6ac663e4d8529596.zip | |
Merge pull request #11019 from tkhr/test_case_for_issue_10393
Add test case for issue #10393 and fix warning message
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/model_schema.rb | 2 |
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 e10e6b4aa8..40cc8dcd69 100644 --- a/activerecord/lib/active_record/model_schema.rb +++ b/activerecord/lib/active_record/model_schema.rb @@ -159,7 +159,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 - 'type' + (@inheritance_column ||= nil) || 'type' else (@inheritance_column ||= nil) || superclass.inheritance_column end |