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/test | |
| 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/test')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 76b999efac..bddaf6afa8 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1503,6 +1503,16 @@ class BasicsTest < ActiveRecord::TestCase 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 |