kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Revert "Merge pull request #41232 from code4me/fix-malformed-packet-master"

Browse source 
This reverts commit 8b3fc5ce30, reversing
changes made to 668c1409f1.

See #41403.
This commit is contained in:
Rafael Mendonça França 2021-02-17 18:12:36 +00:00
parent 89b52a8dd3
commit 8d24c6ba5e
No known key found for this signature in database
GPG key ID: FC23B6D0F1EEE948
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
View file

@ -751,11 +751,6 @@ module ActiveRecord
wait_timeout = 2147483 unless wait_timeout.is_a?(Integer)
variables["wait_timeout"] = wait_timeout
# Set the collation of the connection character set.
if @config[:collation]
variables["collation_connection"] = @config[:collation]
end
defaults = [":default", :default].to_set
# Make MySQL reject illegal values rather than truncating or blanking them, see
@ -775,6 +770,15 @@ module ActiveRecord
end
sql_mode_assignment = "@@SESSION.sql_mode = #{sql_mode}, " if sql_mode
# NAMES does not have an equals sign, see
# https://dev.mysql.com/doc/refman/en/set-names.html
# (trailing comma because variable_assignments will always have content)
if @config[:encoding]
encoding = +"NAMES #{@config[:encoding]}"
encoding << " COLLATE #{@config[:collation]}" if @config[:collation]
encoding << ", "
end
# Gather up all of the SET variables...
variable_assignments = variables.map do |k, v|
if defaults.include?(v)
@ -786,7 +790,7 @@ module ActiveRecord
end.compact.join(", ")
# ...and send them all in one query
execute("SET #{sql_mode_assignment} #{variable_assignments}", "SCHEMA")
execute("SET #{encoding} #{sql_mode_assignment} #{variable_assignments}", "SCHEMA")
end
def column_definitions(table_name) # :nodoc: