diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-15 18:31:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-15 18:31:20 -0700 |
| commit | e61e0c0b0301155d8d184f02f2ad16b341699d4d (patch) | |
| tree | 298cf8d417b8bb715835e6e7ba8649624f9a51f7 /activerecord/lib | |
| parent | e2b675131204504fc6a60ecc7ecb3279886e6316 (diff) | |
| parent | cdfcbc48b25ca76fb0aa821d5ee087768e0d6522 (diff) | |
| download | rails-e61e0c0b0301155d8d184f02f2ad16b341699d4d.tar.gz rails-e61e0c0b0301155d8d184f02f2ad16b341699d4d.tar.bz2 rails-e61e0c0b0301155d8d184f02f2ad16b341699d4d.zip | |
Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column
Don't reset inheritance_column when setting explicitly.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/model_schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb index 99847ac161..c85d590ce1 100644 --- a/activerecord/lib/active_record/model_schema.rb +++ b/activerecord/lib/active_record/model_schema.rb @@ -160,6 +160,7 @@ module ActiveRecord # Sets the value of inheritance_column def inheritance_column=(value) @inheritance_column = value.to_s + @explicit_inheritance_column = true end def sequence_name @@ -303,7 +304,7 @@ module ActiveRecord @column_types = nil @content_columns = nil @dynamic_methods_hash = nil - @inheritance_column = nil + @inheritance_column = nil unless defined?(@explicit_inheritance_column) && @explicit_inheritance_column @relation = nil end |