mysql2 0.4.10 → 0.5.2

data/lib/mysql2/client.rb

@@ -4,22 +4,22 @@ module Mysql2
 
     def self.default_query_options
       @default_query_options ||= {
-        :as => :hash,                   # the type of object you want each row back as; also supports :array (an array of values)
-        :async => false,                # don't wait for a result after sending the query, you'll have to monitor the socket yourself then eventually call Mysql2::Client#async_result
-        :cast_booleans => false,        # cast tinyint(1) fields as true/false in ruby
-        :symbolize_keys => false,       # return field names as symbols instead of strings
-        :database_timezone => :local,   # timezone Mysql2 will assume datetime objects are stored in
-        :application_timezone => nil,   # timezone Mysql2 will convert to before handing the object back to the caller
-        :cache_rows => true,            # tells Mysql2 to use its internal row cache for results
-        :connect_flags => REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION,
-        :cast => true,
-        :default_file => nil,
-        :default_group => nil,
+        as: :hash,                   # the type of object you want each row back as; also supports :array (an array of values)
+        async: false,                # don't wait for a result after sending the query, you'll have to monitor the socket yourself then eventually call Mysql2::Client#async_result
+        cast_booleans: false,        # cast tinyint(1) fields as true/false in ruby
+        symbolize_keys: false,       # return field names as symbols instead of strings
+        database_timezone: :local,   # timezone Mysql2 will assume datetime objects are stored in
+        application_timezone: nil,   # timezone Mysql2 will convert to before handing the object back to the caller
+        cache_rows: true,            # tells Mysql2 to use its internal row cache for results
+        connect_flags: REMEMBER_OPTIONS | LONG_PASSWORD | LONG_FLAG | TRANSACTIONS | PROTOCOL_41 | SECURE_CONNECTION | CONNECT_ATTRS,
+        cast: true,
+        default_file: nil,
+        default_group: nil,
       }
     end
 
     def initialize(opts = {})
-      fail Mysql2::Error, "Options parameter must be a Hash" unless opts.is_a? Hash
+      raise Mysql2::Error, "Options parameter must be a Hash" unless opts.is_a? Hash
       opts = Mysql2::Util.key_hash_as_symbols(opts)
       @read_timeout = nil
       @query_options = self.class.default_query_options.dup
@@ -31,7 +31,7 @@ module Mysql2
       opts[:connect_timeout] = 120 unless opts.key?(:connect_timeout)
 
       # TODO: stricter validation rather than silent massaging
-      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout, :default_file, :default_group, :secure_auth, :init_command, :automatic_close, :enable_cleartext_plugin].each do |key|
+      %i[reconnect connect_timeout local_infile read_timeout write_timeout default_file default_group secure_auth init_command automatic_close enable_cleartext_plugin].each do |key|
         next unless opts.key?(key)
         case key
         when :reconnect, :local_infile, :secure_auth, :automatic_close, :enable_cleartext_plugin
@@ -50,21 +50,21 @@ module Mysql2
       ssl_set(*ssl_options) if ssl_options.any? || opts.key?(:sslverify)
       self.ssl_mode = parse_ssl_mode(opts[:ssl_mode]) if opts[:ssl_mode]
 
-      case opts[:flags]
+      flags = case opts[:flags]
       when Array
-        flags = parse_flags_array(opts[:flags], @query_options[:connect_flags])
+        parse_flags_array(opts[:flags], @query_options[:connect_flags])
       when String
-        flags = parse_flags_array(opts[:flags].split(' '), @query_options[:connect_flags])
+        parse_flags_array(opts[:flags].split(' '), @query_options[:connect_flags])
       when Integer
-        flags = @query_options[:connect_flags] | opts[:flags]
+        @query_options[:connect_flags] | opts[:flags]
       else
-        flags = @query_options[:connect_flags]
+        @query_options[:connect_flags]
       end
 
       # SSL verify is a connection flag rather than a mysql_ssl_set option
       flags |= SSL_VERIFY_SERVER_CERT if opts[:sslverify]
 
-      if [:user, :pass, :hostname, :dbname, :db, :sock].any? { |k| @query_options.key?(k) }
+      if %i[user pass hostname dbname db sock].any? { |k| @query_options.key?(k) }
         warn "============= WARNING FROM mysql2 ============="
         warn "The options :user, :pass, :hostname, :dbname, :db, and :sock are deprecated and will be removed at some point in the future."
         warn "Instead, please use :username, :password, :host, :port, :database, :socket, :flags for the options."
@@ -85,8 +85,9 @@ module Mysql2
       port = port.to_i unless port.nil?
       database = database.to_s unless database.nil?
       socket = socket.to_s unless socket.nil?
+      conn_attrs = parse_connect_attrs(opts[:connect_attrs])
 
-      connect user, pass, host, port, database, socket, flags
+      connect user, pass, host, port, database, socket, flags, conn_attrs
     end
 
     def parse_ssl_mode(mode)
@@ -114,14 +115,19 @@ module Mysql2
       end
     end
 
-    if Thread.respond_to?(:handle_interrupt)
-      def query(sql, options = {})
-        Thread.handle_interrupt(::Mysql2::Util::TimeoutError => :never) do
-          _query(sql, @query_options.merge(options))
-        end
+    # Set default program_name in performance_schema.session_connect_attrs
+    # and performance_schema.session_account_connect_attrs
+    def parse_connect_attrs(conn_attrs)
+      return {} if Mysql2::Client::CONNECT_ATTRS.zero?
+      conn_attrs ||= {}
+      conn_attrs[:program_name] ||= $PROGRAM_NAME
+      conn_attrs.each_with_object({}) do |(key, value), hash|
+        hash[key.to_s] = value.to_s
       end
-    else
-      def query(sql, options = {})
+    end
+
+    def query(sql, options = {})
+      Thread.handle_interrupt(::Mysql2::Util::TIMEOUT_ERROR_CLASS => :never) do
         _query(sql, @query_options.merge(options))
       end
     end

data/lib/mysql2/em.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'eventmachine'
 require 'mysql2'
 
@@ -17,7 +15,7 @@ module Mysql2
           detach
           begin
             result = @client.async_result
-          rescue => e
+          rescue StandardError => e
             @deferable.fail(e)
           else
             @deferable.succeed(result)
@@ -41,7 +39,7 @@ module Mysql2
 
       def query(sql, opts = {})
         if ::EM.reactor_running?
-          super(sql, opts.merge(:async => true))
+          super(sql, opts.merge(async: true))
           deferable = ::EM::DefaultDeferrable.new
           @watch = ::EM.watch(socket, Watcher, self, deferable)
           @watch.notify_readable = true

data/lib/mysql2/error.rb

@@ -1,32 +1,65 @@
-# encoding: UTF-8
-
 module Mysql2
   class Error < StandardError
     ENCODE_OPTS = {
-      :undef => :replace,
-      :invalid => :replace,
-      :replace => '?'.freeze,
+      undef: :replace,
+      invalid: :replace,
+      replace: '?'.freeze,
+    }.freeze
+
+    ConnectionError = Class.new(Error)
+    TimeoutError = Class.new(Error)
+
+    CODES = {
+      1205 => TimeoutError, # ER_LOCK_WAIT_TIMEOUT
+
+      1044 => ConnectionError, # ER_DBACCESS_DENIED_ERROR
+      1045 => ConnectionError, # ER_ACCESS_DENIED_ERROR
+      1152 => ConnectionError, # ER_ABORTING_CONNECTION
+      1153 => ConnectionError, # ER_NET_PACKET_TOO_LARGE
+      1154 => ConnectionError, # ER_NET_READ_ERROR_FROM_PIPE
+      1155 => ConnectionError, # ER_NET_FCNTL_ERROR
+      1156 => ConnectionError, # ER_NET_PACKETS_OUT_OF_ORDER
+      1157 => ConnectionError, # ER_NET_UNCOMPRESS_ERROR
+      1158 => ConnectionError, # ER_NET_READ_ERROR
+      1159 => ConnectionError, # ER_NET_READ_INTERRUPTED
+      1160 => ConnectionError, # ER_NET_ERROR_ON_WRITE
+      1161 => ConnectionError, # ER_NET_WRITE_INTERRUPTED
+
+      2001 => ConnectionError, # CR_SOCKET_CREATE_ERROR
+      2002 => ConnectionError, # CR_CONNECTION_ERROR
+      2003 => ConnectionError, # CR_CONN_HOST_ERROR
+      2004 => ConnectionError, # CR_IPSOCK_ERROR
+      2005 => ConnectionError, # CR_UNKNOWN_HOST
+      2006 => ConnectionError, # CR_SERVER_GONE_ERROR
+      2007 => ConnectionError, # CR_VERSION_ERROR
+      2009 => ConnectionError, # CR_WRONG_HOST_INFO
+      2012 => ConnectionError, # CR_SERVER_HANDSHAKE_ERR
+      2013 => ConnectionError, # CR_SERVER_LOST
+      2020 => ConnectionError, # CR_NET_PACKET_TOO_LARGE
+      2026 => ConnectionError, # CR_SSL_CONNECTION_ERROR
+      2027 => ConnectionError, # CR_MALFORMED_PACKET
+      2047 => ConnectionError, # CR_CONN_UNKNOW_PROTOCOL
+      2048 => ConnectionError, # CR_INVALID_CONN_HANDLE
+      2049 => ConnectionError, # CR_UNUSED_1
     }.freeze
 
     attr_reader :error_number, :sql_state
 
     # Mysql gem compatibility
-    alias_method :errno, :error_number
-    alias_method :error, :message
+    alias errno error_number
+    alias error message
 
-    def initialize(msg)
-      @server_version ||= nil
+    def initialize(msg, server_version = nil, error_number = nil, sql_state = nil)
+      @server_version = server_version
+      @error_number = error_number
+      @sql_state = sql_state ? sql_state.encode(ENCODE_OPTS) : nil
 
       super(clean_message(msg))
     end
 
     def self.new_with_args(msg, server_version, error_number, sql_state)
-      err = allocate
-      err.instance_variable_set('@server_version', server_version)
-      err.instance_variable_set('@error_number', error_number)
-      err.instance_variable_set('@sql_state', sql_state.respond_to?(:encode) ? sql_state.encode(ENCODE_OPTS) : sql_state)
-      err.send(:initialize, msg)
-      err
+      error_class = CODES.fetch(error_number, self)
+      error_class.new(msg, server_version, error_number, sql_state)
     end
 
     private
@@ -55,12 +88,8 @@ module Mysql2
     # encoding, we'll assume UTF-8 and clean the string of anything that's not a
     # valid UTF-8 character.
     #
-    # Except for if we're on 1.8, where we'll do nothing ;)
-    #
-    # Returns a valid UTF-8 string in Ruby 1.9+, the original string on Ruby 1.8
+    # Returns a valid UTF-8 string.
     def clean_message(message)
-      return message unless message.respond_to?(:encode)
-
       if @server_version && @server_version > 50500
         message.encode(ENCODE_OPTS)
       else

data/lib/mysql2/result.rb

@@ -1,5 +1,7 @@
 module Mysql2
   class Result
+    attr_reader :server_flags
+
     include Enumerable
   end
 end

data/lib/mysql2/statement.rb

@@ -2,15 +2,9 @@ module Mysql2
   class Statement
     include Enumerable
 
-    if Thread.respond_to?(:handle_interrupt)
-      def execute(*args)
-        Thread.handle_interrupt(::Mysql2::Util::TimeoutError => :never) do
-          _execute(*args)
-        end
-      end
-    else
-      def execute(*args)
-        _execute(*args)
+    def execute(*args, **kwargs)
+      Thread.handle_interrupt(::Mysql2::Util::TIMEOUT_ERROR_CLASS => :never) do
+        _execute(*args, **kwargs)
       end
     end
   end

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.4.10"
+  VERSION = "0.5.2".freeze
 end

data/spec/em/em_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 begin
   require 'eventmachine'
@@ -49,13 +48,13 @@ begin
     end
 
     it "should not swallow exceptions raised in callbacks" do
-      expect {
+      expect do
         EM.run do
           client = Mysql2::EM::Client.new DatabaseCredentials['root']
           defer = client.query "SELECT sleep(0.1) as first_query"
           defer.callback do
             client.close
-            fail 'some error'
+            raise 'some error'
           end
           defer.errback do
             # This _shouldn't_ be run, but it needed to prevent the specs from
@@ -63,7 +62,7 @@ begin
             EM.stop_event_loop
           end
         end
-      }.to raise_error('some error')
+      end.to raise_error('some error')
     end
 
     context 'when an exception is raised by the client' do
@@ -123,9 +122,9 @@ begin
         end
         EM.add_timer(0.1) do
           expect(callbacks_run).to eq([:callback])
-          expect {
+          expect do
             client.close
-          }.not_to raise_error
+          end.not_to raise_error
           EM.stop_event_loop
         end
       end

data/spec/mysql2/client_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 RSpec.describe Mysql2::Client do
@@ -6,46 +5,46 @@ RSpec.describe Mysql2::Client do
     let(:cnf_file) { File.expand_path('../../my.cnf', __FILE__) }
 
     it "should not raise an exception for valid defaults group" do
-      expect {
-        new_client(:default_file => cnf_file, :default_group => "test")
-      }.not_to raise_error
+      expect do
+        new_client(default_file: cnf_file, default_group: "test")
+      end.not_to raise_error
     end
 
     it "should not raise an exception without default group" do
-      expect {
-        new_client(:default_file => cnf_file)
-      }.not_to raise_error
+      expect do
+        new_client(default_file: cnf_file)
+      end.not_to raise_error
     end
   end
 
-  it "should raise an exception upon connection failure" do
-    expect {
+  it "should raise a Mysql::Error::ConnectionError upon connection failure" do
+    expect do
       # The odd local host IP address forces the mysql client library to
       # use a TCP socket rather than a domain socket.
       new_client('host' => '127.0.0.2', 'port' => 999999)
-    }.to raise_error(Mysql2::Error)
+    end.to raise_error(Mysql2::Error::ConnectionError)
   end
 
   it "should raise an exception on create for invalid encodings" do
-    expect {
-      new_client(:encoding => "fake")
-    }.to raise_error(Mysql2::Error)
+    expect do
+      new_client(encoding: "fake")
+    end.to raise_error(Mysql2::Error)
   end
 
   it "should raise an exception on non-string encodings" do
-    expect {
-      new_client(:encoding => :fake)
-    }.to raise_error(TypeError)
+    expect do
+      new_client(encoding: :fake)
+    end.to raise_error(TypeError)
   end
 
   it "should not raise an exception on create for a valid encoding" do
-    expect {
-      new_client(:encoding => "utf8")
-    }.not_to raise_error
+    expect do
+      new_client(encoding: "utf8")
+    end.not_to raise_error
 
-    expect {
-      new_client(DatabaseCredentials['root'].merge(:encoding => "big5"))
-    }.not_to raise_error
+    expect do
+      new_client(DatabaseCredentials['root'].merge(encoding: "big5"))
+    end.not_to raise_error
   end
 
   Klient = Class.new(Mysql2::Client) do
@@ -57,18 +56,18 @@ RSpec.describe Mysql2::Client do
   end
 
   it "should accept connect flags and pass them to #connect" do
-    client = Klient.new :flags => Mysql2::Client::FOUND_ROWS
+    client = Klient.new flags: Mysql2::Client::FOUND_ROWS
     expect(client.connect_args.last[6] & Mysql2::Client::FOUND_ROWS).to be > 0
   end
 
   it "should parse flags array" do
-    client = Klient.new :flags => %w( FOUND_ROWS -PROTOCOL_41 )
+    client = Klient.new flags: %w[FOUND_ROWS -PROTOCOL_41]
     expect(client.connect_args.last[6] & Mysql2::Client::FOUND_ROWS).to eql(Mysql2::Client::FOUND_ROWS)
     expect(client.connect_args.last[6] & Mysql2::Client::PROTOCOL_41).to eql(0)
   end
 
   it "should parse flags string" do
-    client = Klient.new :flags => "FOUND_ROWS -PROTOCOL_41"
+    client = Klient.new flags: "FOUND_ROWS -PROTOCOL_41"
     expect(client.connect_args.last[6] & Mysql2::Client::FOUND_ROWS).to eql(Mysql2::Client::FOUND_ROWS)
     expect(client.connect_args.last[6] & Mysql2::Client::PROTOCOL_41).to eql(0)
   end
@@ -80,7 +79,8 @@ RSpec.describe Mysql2::Client do
                    Mysql2::Client::LONG_FLAG |
                    Mysql2::Client::TRANSACTIONS |
                    Mysql2::Client::PROTOCOL_41 |
-                   Mysql2::Client::SECURE_CONNECTION
+                   Mysql2::Client::SECURE_CONNECTION |
+                   Mysql2::Client::CONNECT_ATTRS
     expect(client.connect_args.last[6]).to eql(client_flags)
   end
 
@@ -135,18 +135,16 @@ RSpec.describe Mysql2::Client do
 
     # You may need to adjust the lines below to match your SSL certificate paths
     ssl_client = nil
-    expect {
-      # rubocop:disable Style/TrailingComma
+    expect do
       ssl_client = new_client(
         'host'     => 'mysql2gem.example.com', # must match the certificates
         :sslkey    => '/etc/mysql/client-key.pem',
         :sslcert   => '/etc/mysql/client-cert.pem',
         :sslca     => '/etc/mysql/ca-cert.pem',
         :sslcipher => 'DHE-RSA-AES256-SHA',
-        :sslverify => true
+        :sslverify => true,
       )
-      # rubocop:enable Style/TrailingComma
-    }.not_to raise_error
+    end.not_to raise_error
 
     results = Hash[ssl_client.query('SHOW STATUS WHERE Variable_name LIKE "Ssl_%"').map { |x| x.values_at('Variable_name', 'Value') }]
     expect(results['Ssl_cipher']).not_to be_empty
@@ -166,7 +164,8 @@ RSpec.describe Mysql2::Client do
   end
 
   it "should terminate connections when calling close" do
-    expect {
+    # rubocop:disable Lint/AmbiguousBlockAssociation
+    expect do
       client = Mysql2::Client.new(DatabaseCredentials['root'])
       connection_id = client.thread_id
       client.close
@@ -180,27 +179,64 @@ RSpec.describe Mysql2::Client do
         sleep(0.1)
       end
       expect(closed).to eq(true)
-    }.to_not change {
+    end.to_not change {
       @client.query("SHOW STATUS LIKE 'Aborted_%'").to_a
     }
+    # rubocop:enable Lint/AmbiguousBlockAssociation
   end
 
   it "should not leave dangling connections after garbage collection" do
     run_gc
-    expect {
-      expect {
+    # rubocop:disable Lint/AmbiguousBlockAssociation
+    expect do
+      expect do
         10.times do
           Mysql2::Client.new(DatabaseCredentials['root']).query('SELECT 1')
         end
-      }.to change {
+      end.to change {
         @client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
       }.by(10)
 
       run_gc
-    }.to_not change {
+    end.to_not change {
       @client.query("SHOW STATUS LIKE 'Aborted_%'").to_a +
         @client.query("SHOW STATUS LIKE 'Threads_connected'").to_a
     }
+    # rubocop:enable Lint/AmbiguousBlockAssociation
+  end
+
+  context "#set_server_option" do
+    let(:client) do
+      new_client.tap do |client|
+        client.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)
+      end
+    end
+
+    it 'returns true when multi_statements is enable' do
+      expect(client.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_ON)).to be true
+    end
+
+    it 'returns true when multi_statements is disable' do
+      expect(client.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)).to be true
+    end
+
+    it 'returns false when multi_statements is neither OPTION_MULTI_STATEMENTS_OFF or OPTION_MULTI_STATEMENTS_ON' do
+      expect(client.set_server_option(344)).to be false
+    end
+
+    it 'enables multiple-statement' do
+      client.query("SELECT 1;SELECT 2;")
+
+      expect(client.next_result).to be true
+      expect(client.store_result.first).to eql('2' => 2)
+      expect(client.next_result).to be false
+    end
+
+    it 'disables multiple-statement' do
+      client.set_server_option(Mysql2::Client::OPTION_MULTI_STATEMENTS_OFF)
+
+      expect { client.query("SELECT 1;SELECT 2;") }.to raise_error(Mysql2::Error)
+    end
   end
 
   context "#automatic_close" do
@@ -211,24 +247,24 @@ RSpec.describe Mysql2::Client do
     if RUBY_PLATFORM =~ /mingw|mswin/
       it "cannot be disabled" do
         expect do
-          client = new_client(:automatic_close => false)
+          client = new_client(automatic_close: false)
           expect(client.automatic_close?).to be(true)
         end.to output(/always closed by garbage collector/).to_stderr
 
         expect do
-          client = new_client(:automatic_close => true)
+          client = new_client(automatic_close: true)
           expect(client.automatic_close?).to be(true)
         end.to_not output(/always closed by garbage collector/).to_stderr
 
         expect do
-          client = new_client(:automatic_close => true)
+          client = new_client(automatic_close: true)
           client.automatic_close = false
           expect(client.automatic_close?).to be(true)
         end.to output(/always closed by garbage collector/).to_stderr
       end
     else
       it "can be configured" do
-        client = new_client(:automatic_close => false)
+        client = new_client(automatic_close: false)
         expect(client.automatic_close?).to be(false)
       end
 
@@ -272,9 +308,9 @@ RSpec.describe Mysql2::Client do
     database = 1235
     @client.query "CREATE DATABASE IF NOT EXISTS `#{database}`"
 
-    expect {
+    expect do
       new_client('database' => database)
-    }.not_to raise_error
+    end.not_to raise_error
 
     @client.query "DROP DATABASE IF EXISTS `#{database}`"
   end
@@ -285,9 +321,9 @@ RSpec.describe Mysql2::Client do
 
   it "should be able to close properly" do
     expect(@client.close).to be_nil
-    expect {
+    expect do
       @client.query "SELECT 1"
-    }.to raise_error(Mysql2::Error)
+    end.to raise_error(Mysql2::Error)
   end
 
   context "#closed?" do
@@ -302,11 +338,11 @@ RSpec.describe Mysql2::Client do
   end
 
   it "should not try to query closed mysql connection" do
-    client = new_client(:reconnect => true)
+    client = new_client(reconnect: true)
     expect(client.close).to be_nil
-    expect {
+    expect do
       client.query "SELECT 1"
-    }.to raise_error(Mysql2::Error)
+    end.to raise_error(Mysql2::Error)
   end
 
   it "should respond to #query" do
@@ -355,7 +391,7 @@ RSpec.describe Mysql2::Client do
         # # Note that mysql_info() returns a non-NULL value for INSERT ... VALUES only for the multiple-row form of the statement (that is, only if multiple value lists are specified).
         @client.query("INSERT INTO infoTest (blah) VALUES (1234),(4535)")
 
-        expect(@client.query_info).to eql(:records => 2, :duplicates => 0, :warnings => 0)
+        expect(@client.query_info).to eql(records: 2, duplicates: 0, warnings: 0)
         expect(@client.query_info_string).to eq('Records: 2  Duplicates: 0  Warnings: 0')
 
         @client.query "DROP TABLE infoTest"
@@ -365,7 +401,7 @@ RSpec.describe Mysql2::Client do
 
   context ":local_infile" do
     before(:all) do
-      new_client(:local_infile => true) do |client|
+      new_client(local_infile: true) do |client|
         local = client.query "SHOW VARIABLES LIKE 'local_infile'"
         local_enabled = local.any? { |x| x['Value'] == 'ON' }
         skip("DON'T WORRY, THIS TEST PASSES - but LOCAL INFILE is not enabled in your MySQL daemon.") unless local_enabled
@@ -387,24 +423,24 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should raise an error when local_infile is disabled" do
-      client = new_client(:local_infile => false)
-      expect {
+      client = new_client(local_infile: false)
+      expect do
         client.query "LOAD DATA LOCAL INFILE 'spec/test_data' INTO TABLE infileTest"
-      }.to raise_error(Mysql2::Error, /command is not allowed/)
+      end.to raise_error(Mysql2::Error, /command is not allowed/)
     end
 
     it "should raise an error when a non-existent file is loaded" do
-      client = new_client(:local_infile => true)
-      expect {
+      client = new_client(local_infile: true)
+      expect do
         client.query "LOAD DATA LOCAL INFILE 'this/file/is/not/here' INTO TABLE infileTest"
-      }.to raise_error(Mysql2::Error, 'No such file or directory: this/file/is/not/here')
+      end.to raise_error(Mysql2::Error, 'No such file or directory: this/file/is/not/here')
     end
 
     it "should LOAD DATA LOCAL INFILE" do
-      client = new_client(:local_infile => true)
+      client = new_client(local_infile: true)
       client.query "LOAD DATA LOCAL INFILE 'spec/test_data' INTO TABLE infileTest"
       info = client.query_info
-      expect(info).to eql(:records => 1, :deleted => 0, :skipped => 0, :warnings => 0)
+      expect(info).to eql(records: 1, deleted: 0, skipped: 0, warnings: 0)
 
       result = client.query "SELECT * FROM infileTest"
       expect(result.first).to eql('id' => 1, 'foo' => 'Hello', 'bar' => 'World')
@@ -412,57 +448,77 @@ RSpec.describe Mysql2::Client do
   end
 
   it "should expect connect_timeout to be a positive integer" do
-    expect {
-      new_client(:connect_timeout => -1)
-    }.to raise_error(Mysql2::Error)
+    expect do
+      new_client(connect_timeout: -1)
+    end.to raise_error(Mysql2::Error)
   end
 
   it "should expect read_timeout to be a positive integer" do
-    expect {
-      new_client(:read_timeout => -1)
-    }.to raise_error(Mysql2::Error)
+    expect do
+      new_client(read_timeout: -1)
+    end.to raise_error(Mysql2::Error)
   end
 
   it "should expect write_timeout to be a positive integer" do
-    expect {
-      new_client(:write_timeout => -1)
-    }.to raise_error(Mysql2::Error)
+    expect do
+      new_client(write_timeout: -1)
+    end.to raise_error(Mysql2::Error)
   end
 
   it "should allow nil read_timeout" do
-    client = new_client(:read_timeout => nil)
+    client = new_client(read_timeout: nil)
 
     expect(client.read_timeout).to be_nil
   end
 
+  it "should set default program_name in connect_attrs" do
+    client = new_client
+    if Mysql2::Client::CONNECT_ATTRS.zero? || client.server_info[:version].match(/10.[01].\d+-MariaDB/)
+      pending('Both client and server versions must be MySQL 5.6 or MariaDB 10.2 or later.')
+    end
+    result = client.query("SELECT attr_value FROM performance_schema.session_account_connect_attrs WHERE processlist_id = connection_id() AND attr_name = 'program_name'")
+    expect(result.first['attr_value']).to eq($PROGRAM_NAME)
+  end
+
+  it "should set custom connect_attrs" do
+    client = new_client(connect_attrs: { program_name: 'my_program_name', foo: 'fooval', bar: 'barval' })
+    if Mysql2::Client::CONNECT_ATTRS.zero? || client.server_info[:version].match(/10.[01].\d+-MariaDB/)
+      pending('Both client and server versions must be MySQL 5.6 or MariaDB 10.2 or later.')
+    end
+    results = Hash[client.query("SELECT * FROM performance_schema.session_account_connect_attrs WHERE processlist_id = connection_id()").map { |x| x.values_at('ATTR_NAME', 'ATTR_VALUE') }]
+    expect(results['program_name']).to eq('my_program_name')
+    expect(results['foo']).to eq('fooval')
+    expect(results['bar']).to eq('barval')
+  end
+
   context "#query" do
     it "should let you query again if iterating is finished when streaming" do
-      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each.to_a
+      @client.query("SELECT 1 UNION SELECT 2", stream: true, cache_rows: false).each.to_a
 
-      expect {
-        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
-      }.to_not raise_error
+      expect do
+        @client.query("SELECT 1 UNION SELECT 2", stream: true, cache_rows: false)
+      end.to_not raise_error
     end
 
     it "should not let you query again if iterating is not finished when streaming" do
-      @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).first
+      @client.query("SELECT 1 UNION SELECT 2", stream: true, cache_rows: false).first
 
-      expect {
-        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
-      }.to raise_exception(Mysql2::Error)
+      expect do
+        @client.query("SELECT 1 UNION SELECT 2", stream: true, cache_rows: false)
+      end.to raise_exception(Mysql2::Error)
     end
 
     it "should only accept strings as the query parameter" do
-      expect {
+      expect do
         @client.query ["SELECT 'not right'"]
-      }.to raise_error(TypeError)
+      end.to raise_error(TypeError)
     end
 
     it "should not retain query options set on a query for subsequent queries, but should retain it in the result" do
-      result = @client.query "SELECT 1", :something => :else
+      result = @client.query "SELECT 1", something: :else
       expect(@client.query_options[:something]).to be_nil
-      expect(result.instance_variable_get('@query_options')).to eql(@client.query_options.merge(:something => :else))
-      expect(@client.instance_variable_get('@current_query_options')).to eql(@client.query_options.merge(:something => :else))
+      expect(result.instance_variable_get('@query_options')).to eql(@client.query_options.merge(something: :else))
+      expect(@client.instance_variable_get('@current_query_options')).to eql(@client.query_options.merge(something: :else))
 
       result = @client.query "SELECT 1"
       expect(result.instance_variable_get('@query_options')).to eql(@client.query_options)
@@ -470,7 +526,7 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should allow changing query options for subsequent queries" do
-      @client.query_options.merge!(:something => :else)
+      @client.query_options[:something] = :else
       result = @client.query "SELECT 1"
       expect(@client.query_options[:something]).to eql(:else)
       expect(result.instance_variable_get('@query_options')[:something]).to eql(:else)
@@ -485,19 +541,19 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should be able to return results as an array" do
-      expect(@client.query("SELECT 1", :as => :array).first).to be_an_instance_of(Array)
-      @client.query("SELECT 1").each(:as => :array)
+      expect(@client.query("SELECT 1", as: :array).first).to be_an_instance_of(Array)
+      @client.query("SELECT 1").each(as: :array)
     end
 
     it "should be able to return results with symbolized keys" do
-      expect(@client.query("SELECT 1", :symbolize_keys => true).first.keys[0]).to be_an_instance_of(Symbol)
+      expect(@client.query("SELECT 1", symbolize_keys: true).first.keys[0]).to be_an_instance_of(Symbol)
     end
 
     it "should require an open connection" do
       @client.close
-      expect {
+      expect do
         @client.query "SELECT 1"
-      }.to raise_error(Mysql2::Error)
+      end.to raise_error(Mysql2::Error)
     end
 
     it "should detect closed connection on query read error" do
@@ -508,37 +564,37 @@ RSpec.describe Mysql2::Client do
           supervisor.query("KILL #{connection_id}")
         end.close
       end
-      expect {
+      expect do
         @client.query("SELECT SLEEP(1)")
-      }.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
+      end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
 
       if RUBY_PLATFORM !~ /mingw|mswin/
-        expect {
+        expect do
           @client.socket
-        }.to raise_error(Mysql2::Error, 'MySQL client is not connected')
+        end.to raise_error(Mysql2::Error, 'MySQL client is not connected')
       end
     end
 
     if RUBY_PLATFORM !~ /mingw|mswin/
       it "should not allow another query to be sent without fetching a result first" do
-        @client.query("SELECT 1", :async => true)
-        expect {
+        @client.query("SELECT 1", async: true)
+        expect do
           @client.query("SELECT 1")
-        }.to raise_error(Mysql2::Error)
+        end.to raise_error(Mysql2::Error)
       end
 
       it "should describe the thread holding the active query" do
-        thr = Thread.new { @client.query("SELECT 1", :async => true) }
+        thr = Thread.new { @client.query("SELECT 1", async: true) }
 
         thr.join
         expect { @client.query('SELECT 1') }.to raise_error(Mysql2::Error, Regexp.new(Regexp.escape(thr.inspect)))
       end
 
       it "should timeout if we wait longer than :read_timeout" do
-        client = new_client(:read_timeout => 0)
-        expect {
+        client = new_client(read_timeout: 0)
+        expect do
           client.query('SELECT SLEEP(0.1)')
-        }.to raise_error(Mysql2::Error)
+        end.to raise_error(Mysql2::Error::TimeoutError)
       end
 
       # XXX this test is not deterministic (because Unix signal handling is not)
@@ -572,22 +628,18 @@ RSpec.describe Mysql2::Client do
       end
 
       it "#socket should return a Fixnum (file descriptor from C)" do
-        expect(@client.socket).to be_an_instance_of(Fixnum)
+        expect(@client.socket).to be_an_instance_of(0.class)
         expect(@client.socket).not_to eql(0)
       end
 
       it "#socket should require an open connection" do
         @client.close
-        expect {
+        expect do
           @client.socket
-        }.to raise_error(Mysql2::Error)
+        end.to raise_error(Mysql2::Error)
       end
 
       it 'should be impervious to connection-corrupting timeouts in #execute' do
-        # the statement handle gets corrupted and will segfault the tests if interrupted,
-        # so we can't even use pending on this test, really have to skip it on older Rubies.
-        skip('`Thread.handle_interrupt` is not defined') unless Thread.respond_to?(:handle_interrupt)
-
         # attempt to break the connection
         stmt = @client.prepare('SELECT SLEEP(?)')
         expect { Timeout.timeout(0.1) { stmt.execute(0.2) } }.to raise_error(Timeout::Error)
@@ -608,7 +660,7 @@ RSpec.describe Mysql2::Client do
             pending('MySQL 5.5 on OSX is afflicted by an unknown bug that breaks this test. See #633 and #634.')
           end
 
-          client = new_client(:reconnect => true)
+          client = new_client(reconnect: true)
 
           expect { Timeout.timeout(0.1, ArgumentError) { client.query('SELECT SLEEP(1)') } }.to raise_error(ArgumentError)
           expect { client.query('SELECT 1') }.to_not raise_error
@@ -635,7 +687,7 @@ RSpec.describe Mysql2::Client do
         sleep_time = 0.5
 
         # Note that each thread opens its own database connection
-        threads = 5.times.map do
+        threads = Array.new(5) do
           Thread.new do
             new_client do |client|
               client.query("SELECT SLEEP(#{sleep_time})")
@@ -652,19 +704,12 @@ RSpec.describe Mysql2::Client do
       end
 
       it "evented async queries should be supported" do
-        skip("ruby 1.8 doesn't support IO.for_fd options") if RUBY_VERSION.start_with?("1.8.")
         # should immediately return nil
-        expect(@client.query("SELECT sleep(0.1)", :async => true)).to eql(nil)
+        expect(@client.query("SELECT sleep(0.1)", async: true)).to eql(nil)
 
-        io_wrapper = IO.for_fd(@client.socket, :autoclose => false)
+        io_wrapper = IO.for_fd(@client.socket, autoclose: false)
         loops = 0
-        loop do
-          if IO.select([io_wrapper], nil, nil, 0.05)
-            break
-          else
-            loops += 1
-          end
-        end
+        loops += 1 until IO.select([io_wrapper], nil, nil, 0.05)
 
         # make sure we waited some period of time
         expect(loops >= 1).to be true
@@ -676,15 +721,15 @@ RSpec.describe Mysql2::Client do
 
     context "Multiple results sets" do
       before(:each) do
-        @multi_client = new_client(:flags => Mysql2::Client::MULTI_STATEMENTS)
+        @multi_client = new_client(flags: Mysql2::Client::MULTI_STATEMENTS)
       end
 
       it "should raise an exception when one of multiple statements fails" do
         result = @multi_client.query("SELECT 1 AS 'set_1'; SELECT * FROM invalid_table_name; SELECT 2 AS 'set_2';")
         expect(result.first['set_1']).to be(1)
-        expect {
+        expect do
           @multi_client.next_result
-        }.to raise_error(Mysql2::Error)
+        end.to raise_error(Mysql2::Error)
         expect(@multi_client.next_result).to be false
       end
 
@@ -706,17 +751,17 @@ RSpec.describe Mysql2::Client do
 
       it "will raise on query if there are outstanding results to read" do
         @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
-        expect {
+        expect do
           @multi_client.query("SELECT 4")
-        }.to raise_error(Mysql2::Error)
+        end.to raise_error(Mysql2::Error)
       end
 
       it "#abandon_results! should work" do
         @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
         @multi_client.abandon_results!
-        expect {
+        expect do
           @multi_client.query("SELECT 4")
-        }.not_to raise_error
+        end.not_to raise_error
       end
 
       it "#more_results? should work" do
@@ -752,9 +797,9 @@ RSpec.describe Mysql2::Client do
 
   if RUBY_PLATFORM =~ /mingw|mswin/
     it "#socket should raise as it's not supported" do
-      expect {
+      expect do
         @client.socket
-      }.to raise_error(Mysql2::Error, /Raw access to the mysql file descriptor isn't supported on Windows/)
+      end.to raise_error(Mysql2::Error, /Raw access to the mysql file descriptor isn't supported on Windows/)
     end
   end
 
@@ -773,27 +818,25 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should not overflow the thread stack" do
-      expect {
+      expect do
         Thread.new { Mysql2::Client.escape("'" * 256 * 1024) }.join
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it "should not overflow the process stack" do
-      expect {
+      expect do
         Thread.new { Mysql2::Client.escape("'" * 1024 * 1024 * 4) }.join
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
-    unless RUBY_VERSION =~ /1.8/
-      it "should carry over the original string's encoding" do
-        str = "abc'def\"ghi\0jkl%mno"
-        escaped = Mysql2::Client.escape(str)
-        expect(escaped.encoding).to eql(str.encoding)
+    it "should carry over the original string's encoding" do
+      str = "abc'def\"ghi\0jkl%mno"
+      escaped = Mysql2::Client.escape(str)
+      expect(escaped.encoding).to eql(str.encoding)
 
-        str.encode!('us-ascii')
-        escaped = Mysql2::Client.escape(str)
-        expect(escaped.encoding).to eql(str.encoding)
-      end
+      str.encode!('us-ascii')
+      escaped = Mysql2::Client.escape(str)
+      expect(escaped.encoding).to eql(str.encoding)
     end
   end
 
@@ -812,28 +855,26 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should not overflow the thread stack" do
-      expect {
+      expect do
         Thread.new { @client.escape("'" * 256 * 1024) }.join
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it "should not overflow the process stack" do
-      expect {
+      expect do
         Thread.new { @client.escape("'" * 1024 * 1024 * 4) }.join
-      }.not_to raise_error
+      end.not_to raise_error
     end
 
     it "should require an open connection" do
       @client.close
-      expect {
+      expect do
         @client.escape ""
-      }.to raise_error(Mysql2::Error)
+      end.to raise_error(Mysql2::Error)
     end
 
     context 'when mysql encoding is not utf8' do
-      before { pending('Encoding is undefined') unless defined?(Encoding) }
-
-      let(:client) { new_client(:encoding => "ujis") }
+      let(:client) { new_client(encoding: "ujis") }
 
       it 'should return a internal encoding string if Encoding.default_internal is set' do
         with_internal_encoding Encoding::UTF_8 do
@@ -852,14 +893,12 @@ RSpec.describe Mysql2::Client do
     info = @client.info
     expect(info).to be_an_instance_of(Hash)
     expect(info).to have_key(:id)
-    expect(info[:id]).to be_an_instance_of(Fixnum)
+    expect(info[:id]).to be_an_instance_of(0.class)
     expect(info).to have_key(:version)
     expect(info[:version]).to be_an_instance_of(String)
   end
 
   context "strings returned by #info" do
-    before { pending('Encoding is undefined') unless defined?(Encoding) }
-
     it "should be tagged as ascii" do
       expect(@client.info[:version].encoding).to eql(Encoding::US_ASCII)
       expect(@client.info[:header_version].encoding).to eql(Encoding::US_ASCII)
@@ -867,8 +906,6 @@ RSpec.describe Mysql2::Client do
   end
 
   context "strings returned by .info" do
-    before { pending('Encoding is undefined') unless defined?(Encoding) }
-
     it "should be tagged as ascii" do
       expect(Mysql2::Client.info[:version].encoding).to eql(Encoding::US_ASCII)
       expect(Mysql2::Client.info[:header_version].encoding).to eql(Encoding::US_ASCII)
@@ -883,26 +920,24 @@ RSpec.describe Mysql2::Client do
     server_info = @client.server_info
     expect(server_info).to be_an_instance_of(Hash)
     expect(server_info).to have_key(:id)
-    expect(server_info[:id]).to be_an_instance_of(Fixnum)
+    expect(server_info[:id]).to be_an_instance_of(0.class)
     expect(server_info).to have_key(:version)
     expect(server_info[:version]).to be_an_instance_of(String)
   end
 
   it "#server_info should require an open connection" do
     @client.close
-    expect {
+    expect do
       @client.server_info
-    }.to raise_error(Mysql2::Error)
+    end.to raise_error(Mysql2::Error)
   end
 
   context "strings returned by #server_info" do
-    before { pending('Encoding is undefined') unless defined?(Encoding) }
-
     it "should default to the connection's encoding if Encoding.default_internal is nil" do
       with_internal_encoding nil do
         expect(@client.server_info[:version].encoding).to eql(Encoding::UTF_8)
 
-        client2 = new_client(:encoding => 'ascii')
+        client2 = new_client(encoding: 'ascii')
         expect(client2.server_info[:version].encoding).to eql(Encoding::ASCII)
       end
     end
@@ -918,14 +953,14 @@ RSpec.describe Mysql2::Client do
     end
   end
 
-  it "should raise a Mysql2::Error exception upon connection failure" do
-    expect {
-      new_client(:host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42')
-    }.to raise_error(Mysql2::Error)
+  it "should raise a Mysql2::Error::ConnectionError exception upon connection failure due to invalid credentials" do
+    expect do
+      new_client(host: 'localhost', username: 'asdfasdf8d2h', password: 'asdfasdfw42')
+    end.to raise_error(Mysql2::Error::ConnectionError)
 
-    expect {
+    expect do
       new_client(DatabaseCredentials['root'])
-    }.not_to raise_error
+    end.not_to raise_error
   end
 
   context 'write operations api' do
@@ -974,7 +1009,7 @@ RSpec.describe Mysql2::Client do
   end
 
   it "#thread_id should be a Fixnum" do
-    expect(@client.thread_id).to be_an_instance_of(Fixnum)
+    expect(@client.thread_id).to be_an_instance_of(0.class)
   end
 
   it "should respond to #ping" do
@@ -1010,9 +1045,9 @@ RSpec.describe Mysql2::Client do
     end
 
     it "should raise a Mysql2::Error when the database doesn't exist" do
-      expect {
+      expect do
         @client.select_db("nopenothere")
-      }.to raise_error(Mysql2::Error)
+      end.to raise_error(Mysql2::Error)
     end
 
     it "should return the database switched to" do
@@ -1027,13 +1062,11 @@ RSpec.describe Mysql2::Client do
   end
 
   it "should be able to connect using plaintext password" do
-    client = new_client(:enable_cleartext_plugin => true)
+    client = new_client(enable_cleartext_plugin: true)
     client.query('SELECT 1')
   end
 
-  unless RUBY_VERSION =~ /1.8/
-    it "should respond to #encoding" do
-      expect(@client).to respond_to(:encoding)
-    end
+  it "should respond to #encoding" do
+    expect(@client).to respond_to(:encoding)
   end
 end