1 files changed, 33 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 698c3d0cb1..01f647b261 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1479,6 +1479,30 @@ class BasicsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_clear_cash_when_setting_table_name
+    Joke.table_name = "cold_jokes"
+    before_columns = Joke.columns
+    before_seq     = Joke.sequence_name
+
+    Joke.table_name = "funny_jokes"
+    after_columns = Joke.columns
+    after_seq     = Joke.sequence_name
+
+    assert_not_equal before_columns, after_columns
+    assert_not_equal before_seq, after_seq unless before_seq.blank? && after_seq.blank?
+  end
+
+  def test_dont_clear_sequence_name_when_setting_explicitly
+    Joke.sequence_name = "black_jokes_seq"
+    Joke.table_name    = "cold_jokes"
+    before_seq         = Joke.sequence_name
+
+    Joke.table_name    = "funny_jokes"
+    after_seq          = Joke.sequence_name
+
+    assert_equal before_seq, after_seq unless before_seq.blank? && after_seq.blank?
+  end
+
   def test_set_table_name_symbol_converted_to_string
     Joke.table_name = :cold_jokes
     assert_equal 'cold_jokes', Joke.table_name
@@ -1920,6 +1944,15 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal 1, post.comments.length
   end
 
+  def test_marshalling_new_record_round_trip_with_associations
+    post = Post.new
+    post.comments.build
+
+    post = Marshal.load(Marshal.dump(post))
+
+    assert post.new_record?, "should be a new record"
+  end
+
   def test_attribute_names
     assert_equal ["id", "type", "ruby_type", "firm_id", "firm_name", "name", "client_of", "rating", "account_id"],
                  Company.attribute_names