diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-11-29 16:04:22 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-11-29 20:13:36 +0000 |
| commit | fd7ca98bb6218de42b821d48db083ea8c0e97d67 (patch) | |
| tree | 24931bb9587ce8927979b9ca0e870f58e8654963 /activerecord/lib/active_record/base.rb | |
| parent | 34609d67b442366644945a95b019daf5b474727b (diff) | |
| download | rails-fd7ca98bb6218de42b821d48db083ea8c0e97d67.tar.gz rails-fd7ca98bb6218de42b821d48db083ea8c0e97d67.tar.bz2 rails-fd7ca98bb6218de42b821d48db083ea8c0e97d67.zip | |
Add tests for set_sequence_name etc
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
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 |