aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-06-28 13:07:39 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-06-28 13:07:39 +0900
commit1eb5cc13a2ed8922b47df4ae47faf5f23faf3d35 (patch)
tree441602e8c66854b8f61a9eb8b3c74f17262ea645 /activerecord
parent12bc75932562e0ab94da46f46bf719f76702d6d1 (diff)
downloadrails-1eb5cc13a2ed8922b47df4ae47faf5f23faf3d35.tar.gz
rails-1eb5cc13a2ed8922b47df4ae47faf5f23faf3d35.tar.bz2
rails-1eb5cc13a2ed8922b47df4ae47faf5f23faf3d35.zip
Add "SCHEMA" to the query in `configure_connection` like as other adapters
This makes to be able to ignore the query in `assert_queries` even if accidentally reconnected a connection. https://buildkite.com/rails/rails/builds/61917#4c49187a-3173-4d5c-8a8d-d65768f5bfc9/1000-1799
Diffstat (limited to 'activerecord')
-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 70292e6d63..e9ae8d159e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -737,7 +737,7 @@ module ActiveRecord
end.compact.join(", ")
# ...and send them all in one query
- execute "SET #{encoding} #{sql_mode_assignment} #{variable_assignments}"
+ execute("SET #{encoding} #{sql_mode_assignment} #{variable_assignments}", "SCHEMA")
end
def column_definitions(table_name) # :nodoc: