Merge pull request #7196 from rimidl/fix-incorrect-require-mysql-in-mysql_rake_test

Fix incorrect usage `require mysql` in the activerecord/.../mysql_rake_test

1 files changed, 5 insertions, 1 deletions

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 9a0eb423bd..b49561d858 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -1,5 +1,4 @@
 require 'cases/helper'
-require 'mysql'
 
 module ActiveRecord
   class MysqlDBCreateTest < ActiveRecord::TestCase
@@ -46,6 +45,10 @@ module ActiveRecord
 
   class MysqlDBCreateAsRootTest < ActiveRecord::TestCase
     def setup
+      unless current_adapter?(:MysqlAdapter)
+        return skip("only tested on mysql")
+      end
+
       @connection    = stub(:create_database => true, :execute => true)
       @error         = Mysql::Error.new "Invalid permissions"
       @configuration = {
@@ -64,6 +67,7 @@ module ActiveRecord
     end
 
     def test_root_password_is_requested
+      skip "only if mysql is available" unless defined?(::Mysql)
       $stdin.expects(:gets).returns("secret\n")
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration