diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-23 16:46:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 16:46:50 -0500 |
| commit | 771637269dca82782b30e0ef0ef96b5428c6defb (patch) | |
| tree | c11d4d8ddc35c608238caf9115d0991ce892cc7e /activerecord/lib | |
| parent | cfa26648940a864dfe1a383fc5c33089e132b1f9 (diff) | |
| parent | 8aa43f9590ad7f2e47c09d82c266447b39078cb4 (diff) | |
| download | rails-771637269dca82782b30e0ef0ef96b5428c6defb.tar.gz rails-771637269dca82782b30e0ef0ef96b5428c6defb.tar.bz2 rails-771637269dca82782b30e0ef0ef96b5428c6defb.zip | |
Merge pull request #26559 from kamipo/fix_wait_timeout_as_string
Fix `wait_timeout` to configurable for mysql2 adapter
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 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 12dce89306..5f86a11c2d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -870,9 +870,9 @@ module ActiveRecord variables["sql_auto_is_null"] = 0 # Increase timeout so the server doesn't disconnect us. - wait_timeout = @config[:wait_timeout] + wait_timeout = self.class.type_cast_config_to_integer(@config[:wait_timeout]) wait_timeout = 2147483 unless wait_timeout.is_a?(Integer) - variables["wait_timeout"] = self.class.type_cast_config_to_integer(wait_timeout) + variables["wait_timeout"] = wait_timeout defaults = [":default", :default].to_set |