diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2016-09-20 23:41:30 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-02-24 05:54:13 +0900 |
| commit | 8aa43f9590ad7f2e47c09d82c266447b39078cb4 (patch) | |
| tree | 7fec1993b39703b425097106c96efc6a92220158 /activerecord/test/cases/adapters/mysql2/connection_test.rb | |
| parent | 71df60e921a784fb01729e98fa9636a4b6862d72 (diff) | |
| download | rails-8aa43f9590ad7f2e47c09d82c266447b39078cb4.tar.gz rails-8aa43f9590ad7f2e47c09d82c266447b39078cb4.tar.bz2 rails-8aa43f9590ad7f2e47c09d82c266447b39078cb4.zip | |
Fix `wait_timeout` to configurable for mysql2 adapter
Fixes #26556.
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2/connection_test.rb')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/connection_test.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index 1f94472390..ae9ea1c573 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -85,6 +85,22 @@ class Mysql2ConnectionTest < ActiveRecord::Mysql2TestCase assert_equal false, @connection.active? end + def test_wait_timeout_as_string + run_without_connection do |orig_connection| + ActiveRecord::Base.establish_connection(orig_connection.merge(wait_timeout: "60")) + result = ActiveRecord::Base.connection.select_value("SELECT @@SESSION.wait_timeout") + assert_equal 60, result + end + end + + def test_wait_timeout_as_url + run_without_connection do |orig_connection| + ActiveRecord::Base.establish_connection(orig_connection.merge("url" => "mysql2:///?wait_timeout=60")) + result = ActiveRecord::Base.connection.select_value("SELECT @@SESSION.wait_timeout") + assert_equal 60, result + end + end + def test_mysql_connection_collation_is_configured assert_equal "utf8_unicode_ci", @connection.show_variable("collation_connection") assert_equal "utf8_general_ci", ARUnit2Model.connection.show_variable("collation_connection") |