Permalink
Browse files

Merge pull request #5327 from kennyj/fix_explicitly_inheraitance_column

Don't reset inheritance_column when setting explicitly.
  • Loading branch information...
2 parents e2b6751 + cdfcbc4 commit e61e0c0b0301155d8d184f02f2ad16b341699d4d @tenderlove tenderlove committed Mar 16, 2012
Showing with 12 additions and 1 deletion.
  1. +2 −1 activerecord/lib/active_record/model_schema.rb
  2. +10 −0 activerecord/test/cases/base_test.rb
@@ -160,6 +160,7 @@ def inheritance_column
# 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 @@ def reset_column_information
@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
@@ -1503,6 +1503,16 @@ def test_dont_clear_sequence_name_when_setting_explicitly
assert_equal before_seq, after_seq unless before_seq.blank? && after_seq.blank?
end
+ def test_dont_clear_inheritnce_column_when_setting_explicitly
+ Joke.inheritance_column = "my_type"
+ before_inherit = Joke.inheritance_column
+
+ Joke.reset_column_information
+ after_inherit = Joke.inheritance_column
+
+ assert_equal before_inherit, after_inherit unless before_inherit.blank? && after_inherit.blank?
+ end
+
def test_set_table_name_symbol_converted_to_string
Joke.table_name = :cold_jokes
assert_equal 'cold_jokes', Joke.table_name

0 comments on commit e61e0c0

Please sign in to comment.