From 1db36c411ae91e9df7f899664f25019c5110d5eb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 20 Mar 2014 14:41:09 -0700
Subject: Clean up tables after each test.

Follow-Up to https://github.com/rails/rails/pull/14400

This ensures that all tables are removed after each test and thereby
allowing us to run the tests in a random order.
---
 .../test/cases/adapters/mysql/connection_test.rb   | 80 +++++++++++-----------
 1 file changed, 41 insertions(+), 39 deletions(-)

(limited to 'activerecord/test/cases/adapters/mysql/connection_test.rb')

diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 5cd5d8ac5f..42ffb91095 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,6 +1,9 @@
 require "cases/helper"
+require 'support/ddl_helper'
 
 class MysqlConnectionTest < ActiveRecord::TestCase
+  include DdlHelper
+
   class Klass < ActiveRecord::Base
   end
 
@@ -69,59 +72,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) 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) 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) 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
@@ -174,4 +168,12 @@ class MysqlConnectionTest < ActiveRecord::TestCase
       ActiveRecord::Base.establish_connection(original_connection)
     end
   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
-- 
cgit v1.2.3