aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-12-28 22:12:57 -0500
committerGitHub <noreply@github.com>2016-12-28 22:12:57 -0500
commit181249135a1dca4885b2589b3ef6a2d0cb63b4e6 (patch)
treef3c528753d7eee47b0ad29a20b06ae4deac46b7c
parent17ef58db1776a795c9f9e31a1634db7bcdc3ecdf (diff)
parentf4c4c23d7ac80289e829487160caa3128a9ce000 (diff)
downloadrails-181249135a1dca4885b2589b3ef6a2d0cb63b4e6.tar.gz
rails-181249135a1dca4885b2589b3ef6a2d0cb63b4e6.tar.bz2
rails-181249135a1dca4885b2589b3ef6a2d0cb63b4e6.zip
Merge pull request #27402 from yui-knk/execute
Use `#execute` instead of `@connection.query`
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 0717fc4526..20fcac8a22 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -906,7 +906,7 @@ module ActiveRecord
end.compact.join(", ")
# ...and send them all in one query
- @connection.query "SET #{encoding} #{sql_mode_assignment} #{variable_assignments}"
+ execute "SET #{encoding} #{sql_mode_assignment} #{variable_assignments}"
end
def column_definitions(table_name) # :nodoc: