From 9d2da04680db202ba006ff66199b345a3f29b2cb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 9 Nov 2006 19:31:31 +0000 Subject: Cache inheritance_column. Closes #6592. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5474 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/inheritance_test.rb | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'activerecord/test/inheritance_test.rb') diff --git a/activerecord/test/inheritance_test.rb b/activerecord/test/inheritance_test.rb index 65f5d70a1f..6d559d8539 100755 --- a/activerecord/test/inheritance_test.rb +++ b/activerecord/test/inheritance_test.rb @@ -30,6 +30,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_inheritance_find switch_to_alt_inheritance_column test_inheritance_find + switch_to_default_inheritance_column end def test_inheritance_find_all @@ -41,6 +42,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_inheritance_find_all switch_to_alt_inheritance_column test_inheritance_find_all + switch_to_default_inheritance_column end def test_inheritance_save @@ -55,6 +57,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_inheritance_save switch_to_alt_inheritance_column test_inheritance_save + switch_to_default_inheritance_column end def test_inheritance_condition @@ -66,6 +69,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_inheritance_condition switch_to_alt_inheritance_column test_inheritance_condition + switch_to_default_inheritance_column end def test_finding_incorrect_type_data @@ -76,6 +80,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_finding_incorrect_type_data switch_to_alt_inheritance_column test_finding_incorrect_type_data + switch_to_default_inheritance_column end def test_update_all_within_inheritance @@ -87,6 +92,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_update_all_within_inheritance switch_to_alt_inheritance_column test_update_all_within_inheritance + switch_to_default_inheritance_column end def test_destroy_all_within_inheritance @@ -98,6 +104,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_destroy_all_within_inheritance switch_to_alt_inheritance_column test_destroy_all_within_inheritance + switch_to_default_inheritance_column end def test_find_first_within_inheritance @@ -109,6 +116,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_find_first_within_inheritance switch_to_alt_inheritance_column test_find_first_within_inheritance + switch_to_default_inheritance_column end def test_complex_inheritance @@ -124,6 +132,7 @@ class InheritanceTest < Test::Unit::TestCase def test_alt_complex_inheritance switch_to_alt_inheritance_column test_complex_inheritance + switch_to_default_inheritance_column end def test_inheritance_without_mapping @@ -138,7 +147,10 @@ class InheritanceTest < Test::Unit::TestCase c['type'] = nil c.save end - - def Company.inheritance_column() "ruby_type" end + [ Company, Firm, Client].each { |klass| klass.reset_column_information } + def Company.inheritance_column; @inheritance_column ||= "ruby_type"; end + end + def switch_to_default_inheritance_column + [ Company, Firm, Client].each { |klass| klass.reset_column_information } end end -- cgit v1.2.3