1 files changed, 43 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index 8e2b9ca9a5..276c499276 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -4,6 +4,13 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
     @connection = ActiveRecord::Model.connection
+    @connection.extend(LogIntercepter)
+    @connection.intercepted = true
+  end
+
+  def teardown
+    @connection.intercepted = false
+    @connection.logged = []
   end
 
   def test_no_automatic_reconnection_after_timeout
@@ -29,6 +36,42 @@ class MysqlConnectionTest < ActiveRecord::TestCase
     assert @connection.active?
   end
 
+  # TODO: Below is a straight up copy/paste from mysql/connection_test.rb
+  # I'm not sure what the correct way is to share these tests between
+  # adapters in minitest.
+  def test_mysql_default_in_strict_mode
+    result = @connection.exec_query "SELECT @@SESSION.sql_mode"
+    assert_equal [["STRICT_ALL_TABLES"]], result.rows
+  end
+
+  def test_mysql_strict_mode_disabled
+    run_without_connection do |orig_connection|
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:strict => false}))
+      result = ActiveRecord::Model.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal [['']], result.rows
+    end
+  end
+
+  def test_logs_name_structure_dump
+    @connection.structure_dump
+    assert_equal "SCHEMA", @connection.logged[0][1]
+    assert_equal "SCHEMA", @connection.logged[2][1]
+  end
+
+  def test_logs_name_show_variable
+    @connection.show_variable 'foo'
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  end
+
+  def test_logs_name_rename_column_sql
+    @connection.execute "CREATE TABLE `bar_baz` (`foo` varchar(255))"
+    @connection.logged = []
+    @connection.send(:rename_column_sql, 'bar_baz', 'foo', 'foo2')
+    assert_equal "SCHEMA", @connection.logged[0][1]
+  ensure
+    @connection.execute "DROP TABLE `bar_baz`"
+  end
+
   private
 
   def run_without_connection