aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index d1d3888de2..40fa010558 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -707,7 +707,7 @@ module ActiveRecord #:nodoc:
if self == Base
'type'
else
- defined?(@inheritance_column) ? @inheritance_column : superclass.inheritance_column
+ (@inheritance_column ||= nil) || superclass.inheritance_column
end
end