If specify strict: :default explicitly, do not set sql_mode.

kamipo · kamipo · commit a7df5afde416 · 2014-11-19T05:51:14.000+09:00
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -810,7 +810,7 @@ def configure_connection
         # Make MySQL reject illegal values rather than truncating or blanking them, see
         # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
         # If the user has provided another value for sql_mode, don't replace it.
-        if @config.has_key?(:strict) && !variables.has_key?('sql_mode')
+        unless [':default', :default].include?(@config[:strict]) || variables.has_key?('sql_mode')
           variables['sql_mode'] = strict_mode? ? 'STRICT_ALL_TABLES' : ''
         end
 
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -147,9 +147,9 @@ def test_mysql_strict_mode_disabled
     end
   end
 
-  def test_mysql_strict_mode_unspecified
+  def test_mysql_strict_mode_specified_default
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.reject{|key, _| key == :strict})
+      ActiveRecord::Base.establish_connection(orig_connection.merge({strict: :default}))
       global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
       session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
       assert_equal global_sql_mode.rows, session_sql_mode.rows
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -86,9 +86,9 @@ def test_mysql_strict_mode_disabled
     end
   end
 
-  def test_mysql_strict_mode_unspecified
+  def test_mysql_strict_mode_specified_default
     run_without_connection do |orig_connection|
-      ActiveRecord::Base.establish_connection(orig_connection.reject{|key, _| key == :strict})
+      ActiveRecord::Base.establish_connection(orig_connection.merge({strict: :default}))
       global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
       session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
       assert_equal global_sql_mode.rows, session_sql_mode.rows
