From fb24d0ed6c26da70045c6fc128aaa9dcb777c28c Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Tue, 15 Dec 2015 22:01:30 +0000
Subject: Remove legacy mysql adapter

---
 activerecord/test/cases/tasks/mysql_rake_test.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'activerecord/test/cases/tasks')

diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb
index 723a7618ba..7cc74f9d9f 100644
--- a/activerecord/test/cases/tasks/mysql_rake_test.rb
+++ b/activerecord/test/cases/tasks/mysql_rake_test.rb
@@ -1,12 +1,12 @@
 require 'cases/helper'
 
-if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
+if current_adapter?(:Mysql2Adapter)
 module ActiveRecord
   class MysqlDBCreateTest < ActiveRecord::TestCase
     def setup
       @connection    = stub(:create_database => true)
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'my-app-db'
       }
 
@@ -16,7 +16,7 @@ module ActiveRecord
 
     def test_establishes_connection_without_database
       ActiveRecord::Base.expects(:establish_connection).
-        with('adapter' => 'mysql', 'database' => nil)
+        with('adapter' => 'mysql2', 'database' => nil)
 
       ActiveRecord::Tasks::DatabaseTasks.create @configuration
     end
@@ -65,7 +65,7 @@ module ActiveRecord
         @connection    = stub("Connection", create_database: true)
         @error         = Mysql::Error.new "Invalid permissions"
         @configuration = {
-          'adapter'  => 'mysql',
+          'adapter'  => 'mysql2',
           'database' => 'my-app-db',
           'username' => 'pat',
           'password' => 'wossname'
@@ -92,7 +92,7 @@ module ActiveRecord
       def test_connection_established_as_root
         assert_permissions_granted_for "pat"
         ActiveRecord::Base.expects(:establish_connection).with(
-          'adapter'  => 'mysql',
+          'adapter'  => 'mysql2',
           'database' => nil,
           'username' => 'root',
           'password' => 'secret'
@@ -124,7 +124,7 @@ module ActiveRecord
         assert_permissions_granted_for "pat"
         ActiveRecord::Base.expects(:establish_connection).returns do
           ActiveRecord::Base.expects(:establish_connection).with(
-            'adapter'  => 'mysql',
+            'adapter'  => 'mysql2',
             'database' => 'my-app-db',
             'username' => 'pat',
             'password' => 'secret'
@@ -157,7 +157,7 @@ module ActiveRecord
     def setup
       @connection    = stub(:drop_database => true)
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'my-app-db'
       }
 
@@ -182,7 +182,7 @@ module ActiveRecord
     def setup
       @connection    = stub(:recreate_database => true)
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'test-db'
       }
 
@@ -216,7 +216,7 @@ module ActiveRecord
     def setup
       @connection    = stub(:create_database => true)
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'my-app-db'
       }
 
@@ -234,7 +234,7 @@ module ActiveRecord
     def setup
       @connection    = stub(:create_database => true)
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'my-app-db'
       }
 
@@ -251,7 +251,7 @@ module ActiveRecord
   class MySQLStructureDumpTest < ActiveRecord::TestCase
     def setup
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'test-db'
       }
     end
@@ -297,7 +297,7 @@ module ActiveRecord
   class MySQLStructureLoadTest < ActiveRecord::TestCase
     def setup
       @configuration = {
-        'adapter'  => 'mysql',
+        'adapter'  => 'mysql2',
         'database' => 'test-db'
       }
     end
-- 
cgit v1.2.3