1 files changed, 21 insertions, 8 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 2a89430da9..5e1c52c9ba 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -3,13 +3,13 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
-    @connection = ActiveRecord::Base.connection
+    @connection = ActiveRecord::Model.connection
   end
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_true
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => true}))
-      assert ActiveRecord::Base.connection.raw_connection.reconnect
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => true}))
+      assert ActiveRecord::Model.connection.raw_connection.reconnect
     end
   end
 
@@ -25,8 +25,8 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_false
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => false}))
-      assert !ActiveRecord::Base.connection.raw_connection.reconnect
+      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => false}))
+      assert !ActiveRecord::Model.connection.raw_connection.reconnect
     end
   end
 
@@ -114,20 +114,33 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   # Test that MySQL allows multiple results for stored procedures
   if defined?(Mysql) && Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
     def test_multi_results
-      rows = ActiveRecord::Base.connection.select_rows('CALL ten();')
+      rows = ActiveRecord::Model.connection.select_rows('CALL ten();')
       assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
       assert @connection.active?, "Bad connection use by 'MysqlAdapter.select_rows'"
     end
   end
 
+  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
+
   private
 
   def run_without_connection
-    original_connection = ActiveRecord::Base.remove_connection
+    original_connection = ActiveRecord::Model.remove_connection
     begin
       yield original_connection
     ensure
-      ActiveRecord::Base.establish_connection(original_connection)
+      ActiveRecord::Model.establish_connection(original_connection)
     end
   end
 end