Second pass at separating out connect options from query options

Author: sodabrew

lib/mysql2/client.rb

@@ -1,10 +1,14 @@
 module Mysql2
   class Client
-    attr_reader :query_options, :read_timeout
+    attr_reader :query_options, :connect_options, :read_timeout
+
     @@default_connect_options = {
       :connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
+      :connect_timeout => 120,        # Set default connect_timeout to avoid unlimited retries from signal interruption
       :default_file => nil,
-      :default_group => nil
+      :default_group => nil,
+      :read_timeout => nil,
+      :encoding => 'utf8'
     }
 
     @@default_query_options = {
@@ -19,31 +23,28 @@ class Client
     }
 
     def initialize(opts = {})
-      opts = Mysql2::Util.key_hash_as_symbols( opts )
-      @read_timeout = nil
+      opts = Mysql2::Util.key_hash_as_symbols(opts)
       @query_options = @@default_query_options.dup
-      @query_options.merge! @@default_connect_options
       @query_options.merge! opts
+      @connect_options = @@default_connect_options.dup
+      @connect_options.merge! opts
 
       initialize_ext
 
-      # Set default connect_timeout to avoid unlimited retries from signal interruption
-      opts[:connect_timeout] = 120 unless opts.key?(:connect_timeout)
-
       [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout, :default_file, :default_group, :secure_auth, :init_command].each do |key|
-        next unless opts.key?(key)
+        next unless @connect_options.key?(key)
         case key
         when :reconnect, :local_infile, :secure_auth
-          send(:"#{key}=", !!opts[key])
+          send(:"#{key}=", !!@connect_options[key])
         when :connect_timeout, :read_timeout, :write_timeout
-          send(:"#{key}=", opts[key].to_i)
+          send(:"#{key}=", @connect_options[key].to_i)
         else
-          send(:"#{key}=", opts[key])
+          send(:"#{key}=", @connect_options[key])
         end
       end
 
-      # force the encoding to utf8
-      self.charset_name = opts[:encoding] || 'utf8'
+      # force the encoding to utf8 even if set to nil
+      self.charset_name = @connect_options[:encoding] || 'utf8'
 
       ssl_options = opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher)
       ssl_set(*ssl_options) if ssl_options.any?
@@ -78,6 +79,10 @@ def self.default_query_options
       @@default_query_options
     end
 
+    def self.default_connect_options
+      @@default_connect_options
+    end
+
     def query_info
       info = query_info_string
       return {} unless info