4 files changed, 54 insertions, 7 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 7fe2c02c04..073d0b0e73 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -46,6 +46,16 @@ module ActiveRecord
         assert_equal str, value
       end
 
+      def test_tables_quoting
+        begin
+          @conn.tables(nil, "foo-bar", nil)
+          flunk
+        rescue => e
+          # assertion for *quoted* database properly
+          assert_match(/Access denied for user/, e.inspect)
+        end
+      end
+
       private
       def insert(ctx, data)
         binds   = data.map { |name, value|
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index d5676bc522..fd9996c937 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -35,6 +35,17 @@ module ActiveRecord
       def test_table_exists_wrong_schema
         assert(!@connection.table_exists?("#{@db_name}.zomg"), "table should not exist")
       end
+
+      def test_tables_quoting
+        begin
+          @connection.tables(nil, "foo-bar", nil)
+          flunk
+        rescue => e
+          # assertion for *quoted* database properly
+          assert_match(/Access denied for user/, e.inspect)
+        end
+      end
+
     end
   end
 end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 93f4a768d9..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
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index a802cfbf31..917a03bb34 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -89,14 +89,16 @@ class MultipleDbTest < ActiveRecord::TestCase
     assert_equal Entrant.arel_engine, Bird.arel_engine
   end
 
-  def test_associations_should_work_when_model_has_no_connection
-    begin
-      ActiveRecord::Model.remove_connection
-      assert_nothing_raised ActiveRecord::ConnectionNotEstablished do
-        College.first.courses.first
+  unless in_memory_db?
+    def test_associations_should_work_when_model_has_no_connection
+      begin
+        ActiveRecord::Model.remove_connection
+        assert_nothing_raised ActiveRecord::ConnectionNotEstablished do
+          College.first.courses.first
+        end
+      ensure
+        ActiveRecord::Model.establish_connection 'arunit'
       end
-    ensure
-      ActiveRecord::Model.establish_connection 'arunit'
     end
   end
 end