aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2016-12-19 19:47:34 +0900
committeryui-knk <spiketeika@gmail.com>2016-12-19 19:59:07 +0900
commitf4c4c23d7ac80289e829487160caa3128a9ce000 (patch)
tree652a405e8f050480bb058b0394b9a7f0c56c1072
parent3582f58a7558dc0ddb3051b9deb5354aee378b5b (diff)
downloadrails-f4c4c23d7ac80289e829487160caa3128a9ce000.tar.gz
rails-f4c4c23d7ac80289e829487160caa3128a9ce000.tar.bz2
rails-f4c4c23d7ac80289e829487160caa3128a9ce000.zip
Use `#execute` instead of `@connection.query`
`@connection.query` bypasses instrumenting "sql.active_record". This behavior preventing us from debugging SQLs which Rails generates.
-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 6985d2c1b2..bdd44d986f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -908,7 +908,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: