1 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 858d1da2dd..de4d9c2b33 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -13,8 +13,8 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
-          set_table_name "#{db}.#{table}"
+        @omgpost = Class.new(ActiveRecord::Base) do
+          self.table_name = "#{db}.#{table}"
           def self.name; 'Post'; end
         end
       end
@@ -23,6 +23,10 @@ module ActiveRecord
         assert @omgpost.find(:first)
       end
 
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
+      end
+
       def test_table_exists?
         name = @omgpost.table_name
         assert @connection.table_exists?(name), "#{name} table should exist"
@@ -31,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(/database 'foo-bar'/, e.inspect)
+        end
+      end
+
     end
   end
 end