1 files changed, 31 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
index 4efd728754..69336eb906 100644
--- a/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb
@@ -1,10 +1,33 @@
 require "cases/helper"
+require "support/ddl_helper"
 
 class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
+  include DdlHelper
+
   def setup
     @conn = ActiveRecord::Base.connection
   end
 
+  def test_exec_query_nothing_raises_with_no_result_queries
+    assert_nothing_raised do
+      with_example_table do
+        @conn.exec_query("INSERT INTO ex (number) VALUES (1)")
+        @conn.exec_query("DELETE FROM ex WHERE number = 1")
+      end
+    end
+  end
+
+  def test_valid_column
+    with_example_table do
+      column = @conn.columns("ex").find { |col| col.name == "id" }
+      assert @conn.valid_type?(column.type)
+    end
+  end
+
+  def test_invalid_column
+    assert_not @conn.valid_type?(:foobar)
+  end
+
   def test_columns_for_distinct_zero_orders
     assert_equal "posts.id",
       @conn.columns_for_distinct("posts.id", [])
@@ -22,8 +45,8 @@ class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
 
   def test_columns_for_distinct_with_case
     assert_equal(
-      'posts.id, CASE WHEN author.is_active THEN UPPER(author.name) ELSE UPPER(author.email) END AS alias_0',
-      @conn.columns_for_distinct('posts.id',
+      "posts.id, CASE WHEN author.is_active THEN UPPER(author.name) ELSE UPPER(author.email) END AS alias_0",
+      @conn.columns_for_distinct("posts.id",
         ["CASE WHEN author.is_active THEN UPPER(author.name) ELSE UPPER(author.email) END"])
     )
   end
@@ -41,4 +64,10 @@ class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase
     assert_equal "posts.id, posts.created_at AS alias_0",
       @conn.columns_for_distinct("posts.id", [order])
   end
+
+  private
+
+    def with_example_table(definition = "id int auto_increment primary key, number int, data varchar(255)", &block)
+      super(@conn, "ex", definition, &block)
+    end
 end