2 files changed, 20 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index eef2d29d02..24746ea56d 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1531,4 +1531,12 @@ class BasicsTest < ActiveRecord::TestCase
     assert Developer.new.respond_to?(:last_name=)
     assert Developer.new.respond_to?(:last_name?)
   end
+
+  test "table names containing a dot are deprecated" do
+    assert_deprecated do
+      Class.new(ActiveRecord::Base) do
+        self.table_name = "foo.bar"
+      end
+    end
+  end
 end
diff --git a/activerecord/test/cases/statement_cache_test.rb b/activerecord/test/cases/statement_cache_test.rb
index a704b861cb..104226010a 100644
--- a/activerecord/test/cases/statement_cache_test.rb
+++ b/activerecord/test/cases/statement_cache_test.rb
@@ -94,5 +94,17 @@ module ActiveRecord
       additional_books = cache.execute([], Book, Book.connection)
       assert first_books != additional_books
     end
+
+    def test_unprepared_statements_dont_share_a_cache_with_prepared_statements
+      Book.create(name: "my book")
+      Book.create(name: "my other book")
+
+      book = Book.find_by(name: "my book")
+      other_book = Book.connection.unprepared_statement do
+        Book.find_by(name: "my other book")
+      end
+
+      refute_equal book, other_book
+    end
   end
 end