1 files changed, 62 insertions, 54 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 1844a2e0dc..4c90d06732 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,6 +1,11 @@
 require "cases/helper"
+require 'support/connection_helper'
+require 'support/ddl_helper'
 
 class MysqlConnectionTest < ActiveRecord::TestCase
+  include ConnectionHelper
+  include DdlHelper
+
   class Klass < ActiveRecord::Base
   end
 
@@ -16,15 +21,15 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     end
   end
 
-  def test_connect_with_url
-    run_without_connection do
-      ar_config = ARTest.connection_config['arunit']
-
-      skip "This test doesn't work with custom socket location" if ar_config['socket']
+  unless ARTest.connection_config['arunit']['socket']
+    def test_connect_with_url
+      run_without_connection do
+        ar_config = ARTest.connection_config['arunit']
 
-      url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}"
-      Klass.establish_connection(url)
-      assert_equal ar_config['database'], Klass.connection.current_database
+        url = "mysql://#{ar_config["username"]}@localhost/#{ar_config["database"]}"
+        Klass.establish_connection(url)
+        assert_equal ar_config['database'], Klass.connection.current_database
+      end
     end
   end
 
@@ -40,6 +45,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     @connection.update('set @@wait_timeout=1')
     sleep 2
     assert !@connection.active?
+
+    # Repair all fixture connections so other tests won't break.
+    @fixture_connections.each do |c|
+      c.verify!
+    end
   end
 
   def test_successful_reconnection_after_timeout_with_manual_reconnect
@@ -64,59 +74,50 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   end
 
   def test_exec_no_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 0, result.rows.length
-    assert_equal 2, result.columns.length
-    assert_equal %w{ id data }, result.columns
+    with_example_table do
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 0, result.rows.length
+      assert_equal 2, result.columns.length
+      assert_equal %w{ id data }, result.columns
 
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
 
-    # if there are no bind parameters, it will return a string (due to
-    # the libmysql api)
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      # if there are no bind parameters, it will return a string (due to
+      # the libmysql api)
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [['1', 'foo']], result.rows
+      assert_equal [['1', 'foo']], result.rows
+    end
   end
 
   def test_exec_with_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   def test_exec_typecasts_bind_vals
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    column = @connection.columns('ex').find { |col| col.name == 'id' }
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      column = @connection.columns('ex').find { |col| col.name == 'id' }
 
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   # Test that MySQL allows multiple results for stored procedures
@@ -150,6 +151,14 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_mysql_sql_mode_variable_overides_strict_mode
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.deep_merge(variables: { 'sql_mode' => 'ansi' }))
+      result = ActiveRecord::Base.connection.exec_query 'SELECT @@SESSION.sql_mode'
+      assert_not_equal [['STRICT_ALL_TABLES']], result.rows
+    end
+  end
+
   def test_mysql_set_session_variable_to_default
     run_without_connection do |orig_connection|
       ActiveRecord::Base.establish_connection(orig_connection.deep_merge({:variables => {:default_week_format => :default}}))
@@ -161,12 +170,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   private
 
-  def run_without_connection
-    original_connection = ActiveRecord::Base.remove_connection
-    begin
-      yield original_connection
-    ensure
-      ActiveRecord::Base.establish_connection(original_connection)
-    end
+  def with_example_table(&block)
+    definition ||= <<-SQL
+      `id` int(11) auto_increment PRIMARY KEY,
+      `data` varchar(255)
+    SQL
+    super(@connection, 'ex', definition, &block)
   end
 end