diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-26 15:22:05 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-26 15:22:05 -0700 |
| commit | df37c91745a3fb241fafa23c03387e33eb82c74f (patch) | |
| tree | 92b4cb9321a20d1ee03f32c982ac8f332b5469ee /activerecord/test | |
| parent | dbd26e92a7b943a57c2826a749ae25e3ce9e143c (diff) | |
| parent | 8bd56f0f7ad2b48a50f12c49d436a469fdbb7135 (diff) | |
| download | rails-df37c91745a3fb241fafa23c03387e33eb82c74f.tar.gz rails-df37c91745a3fb241fafa23c03387e33eb82c74f.tar.bz2 rails-df37c91745a3fb241fafa23c03387e33eb82c74f.zip | |
Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable
[Backport to 3-2-stable] 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 97d6c0cf88..67b5d174aa 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1540,6 +1540,16 @@ class BasicsTest < ActiveRecord::TestCase end 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 |