Merge pull request #21681 from kamipo/should_test_both_mysql_adapters

Should test both mysql adapters

activerecord/test/cases/adapter_test.rb

@@ -63,7 +63,7 @@ def test_current_database
       end
     end
 
-    if current_adapter?(:MysqlAdapter)
+    if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
       def test_charset
         assert_not_nil @connection.charset
         assert_not_equal 'character_set_database', @connection.charset

activerecord/test/cases/adapters/mysql/active_schema_test.rb

@@ -100,17 +100,15 @@ def test_drop_table
     assert_equal "DROP TABLE `people`", drop_table(:people)
   end
 
-  if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
-    def test_create_mysql_database_with_encoding
-      assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
-      assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
-      assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
-    end
+  def test_create_mysql_database_with_encoding
+    assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
+    assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
+    assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
+  end
 
-    def test_recreate_mysql_database_with_encoding
-      create_database(:luca, {:charset => 'latin1'})
-      assert_equal "CREATE DATABASE `luca` DEFAULT CHARACTER SET `latin1`", recreate_database(:luca, {:charset => 'latin1'})
-    end
+  def test_recreate_mysql_database_with_encoding
+    create_database(:luca, {:charset => 'latin1'})
+    assert_equal "CREATE DATABASE `luca` DEFAULT CHARACTER SET `latin1`", recreate_database(:luca, {:charset => 'latin1'})
   end
 
   def test_add_column

activerecord/test/cases/adapters/mysql2/active_schema_test.rb

@@ -100,17 +100,15 @@ def test_drop_table
     assert_equal "DROP TABLE `people`", drop_table(:people)
   end
 
-  if current_adapter?(:Mysql2Adapter)
-    def test_create_mysql_database_with_encoding
-      assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
-      assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
-      assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
-    end
+  def test_create_mysql_database_with_encoding
+    assert_equal "CREATE DATABASE `matt` DEFAULT CHARACTER SET `utf8`", create_database(:matt)
+    assert_equal "CREATE DATABASE `aimonetti` DEFAULT CHARACTER SET `latin1`", create_database(:aimonetti, {:charset => 'latin1'})
+    assert_equal "CREATE DATABASE `matt_aimonetti` DEFAULT CHARACTER SET `big5` COLLATE `big5_chinese_ci`", create_database(:matt_aimonetti, {:charset => :big5, :collation => :big5_chinese_ci})
+  end
 
-    def test_recreate_mysql_database_with_encoding
-      create_database(:luca, {:charset => 'latin1'})
-      assert_equal "CREATE DATABASE `luca` DEFAULT CHARACTER SET `latin1`", recreate_database(:luca, {:charset => 'latin1'})
-    end
+  def test_recreate_mysql_database_with_encoding
+    create_database(:luca, {:charset => 'latin1'})
+    assert_equal "CREATE DATABASE `luca` DEFAULT CHARACTER SET `latin1`", recreate_database(:luca, {:charset => 'latin1'})
   end
 
   def test_add_column

activerecord/test/cases/attribute_methods_test.rb

@@ -175,7 +175,7 @@ def test_read_attributes_before_type_cast
     assert_equal category_attrs , category.attributes_before_type_cast
   end
 
-  if current_adapter?(:MysqlAdapter)
+  if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
     def test_read_attributes_before_type_cast_on_boolean
       bool = Boolean.create({ "value" => false })
       if RUBY_PLATFORM =~ /java/