mysql2 0.2.24 → 0.3.0

data/lib/mysql2/em.rb

@@ -15,28 +15,18 @@ module Mysql2
         def notify_readable
           detach
           begin
-            result = @client.async_result
+            @deferable.succeed(@client.async_result)
           rescue Exception => e
             @deferable.fail(e)
-          else
-            @deferable.succeed(result)
           end
         end
       end
 
-      def close(*args)
-        if @watch
-          @watch.detach
-        end
-        super(*args)
-      end
-
       def query(sql, opts={})
         if ::EM.reactor_running?
           super(sql, opts.merge(:async => true))
           deferable = ::EM::DefaultDeferrable.new
-          @watch = ::EM.watch(self.socket, Watcher, self, deferable)
-          @watch.notify_readable = true
+          ::EM.watch(self.socket, Watcher, self, deferable).notify_readable = true
           deferable
         else
           super(sql, opts)
@@ -44,4 +34,4 @@ module Mysql2
       end
     end
   end
-end
+end

data/lib/mysql2/em_fiber.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+require 'mysql2/em'
+require 'fiber'
+
+module Mysql2
+  module EM
+    module Fiber
+      class Client < ::Mysql2::EM::Client
+        def query(sql, opts={})
+          if ::EM.reactor_running?
+            deferable = super(sql, opts)
+
+            fiber = ::Fiber.current
+            deferable.callback do |result|
+              fiber.resume(result)
+            end
+            deferable.errback do |err|
+              fiber.resume(err)
+            end
+            ::Fiber.yield.tap do |result|
+              raise result if result.is_a?(::Exception)
+            end
+          else
+            super(sql, opts)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mysql2/error.rb

@@ -1,80 +1,15 @@
-# encoding: UTF-8
-
 module Mysql2
   class Error < StandardError
-    REPLACEMENT_CHAR = '?'
-    ENCODE_OPTS      = {:undef => :replace, :invalid => :replace, :replace => REPLACEMENT_CHAR}
+    attr_accessor :error_number, :sql_state
 
-    attr_accessor :error_number
-    attr_reader   :sql_state
-    attr_writer   :server_version
+    def initialize msg
+      super
+      @error_number = nil
+      @sql_state    = nil
+    end
 
     # Mysql gem compatibility
     alias_method :errno, :error_number
     alias_method :error, :message
-
-    def initialize(msg, server_version=nil)
-      self.server_version = server_version
-
-      super(clean_message(msg))
-    end
-
-    def sql_state=(state)
-      @sql_state = ''.respond_to?(:encode) ? state.encode(ENCODE_OPTS) : state
-    end
-
-    private
-
-    # In MySQL 5.5+ error messages are always constructed server-side as UTF-8
-    # then returned in the encoding set by the `character_set_results` system
-    # variable.
-    #
-    # See http://dev.mysql.com/doc/refman/5.5/en/charset-errors.html for
-    # more contetx.
-    #
-    # Before MySQL 5.5 error message template strings are in whatever encoding
-    # is associated with the error message language.
-    # See http://dev.mysql.com/doc/refman/5.1/en/error-message-language.html
-    # for more information.
-    #
-    # The issue is that the user-data inserted in the message could potentially
-    # be in any encoding MySQL supports and is insert into the latin1, euckr or
-    # koi8r string raw. Meaning there's a high probability the string will be
-    # corrupt encoding-wise.
-    #
-    # See http://dev.mysql.com/doc/refman/5.1/en/charset-errors.html for
-    # more information.
-    #
-    # So in an attempt to make sure the error message string is always in a valid
-    # 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
-    def clean_message(message)
-      return message if !message.respond_to?(:encoding)
-
-      if @server_version && @server_version > 50500
-        message.encode(ENCODE_OPTS)
-      else
-        if message.respond_to? :scrub
-          message.scrub(REPLACEMENT_CHAR).encode(ENCODE_OPTS)
-        else
-          # This is ugly as hell but Ruby 1.9 doesn't provide a way to clean a string
-          # and retain it's valid UTF-8 characters, that I know of.
-
-          new_message = "".force_encoding(Encoding::UTF_8)
-          message.chars.each do |char|
-            if char.valid_encoding?
-              new_message << char
-            else
-              new_message << REPLACEMENT_CHAR
-            end
-          end
-          new_message.encode(ENCODE_OPTS)
-        end
-      end
-    end
   end
 end

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.24"
-end
+  VERSION = "0.3.0"
+end

data/mysql2.gemspec

@@ -0,0 +1,32 @@
+require File.expand_path('../lib/mysql2/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = %q{mysql2}
+  s.version = Mysql2::VERSION
+  s.authors = ["Brian Lopez"]
+  s.date = Time.now.utc.strftime("%Y-%m-%d")
+  s.email = %q{seniorlopez@gmail.com}
+  s.extensions = ["ext/mysql2/extconf.rb"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = `git ls-files`.split("\n")
+  s.homepage = %q{http://github.com/brianmario/mysql2}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib", "ext"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{A simple, fast Mysql library for Ruby, binding to libmysql}
+  s.test_files = `git ls-files spec examples`.split("\n")
+
+  # tests
+  s.add_development_dependency 'eventmachine'
+  s.add_development_dependency 'rake-compiler', "~> 0.7.7"
+  s.add_development_dependency 'rspec'
+  # benchmarks
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'mysql'
+  s.add_development_dependency 'do_mysql'
+  s.add_development_dependency 'sequel'
+  s.add_development_dependency 'faker'
+end
+

data/spec/em/em_fiber_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+if defined? EventMachine && defined? Fiber
+  require 'spec_helper'
+  require 'mysql2/em_fiber'
+
+  describe Mysql2::EM::Fiber::Client do
+    it 'should support queries' do
+      results = []
+      EM.run do
+        Fiber.new {
+          client1 = Mysql2::EM::Fiber::Client.new
+          results = client1.query "SELECT sleep(0.1) as first_query"
+          EM.stop_event_loop
+        }.resume
+      end
+
+      results.first.keys.should include("first_query")
+    end
+  end
+else
+  puts "Either EventMachine or Fibers not available. Skipping tests that use them."
+end

data/spec/em/em_spec.rb

@@ -1,26 +1,23 @@
 # encoding: UTF-8
-require 'spec_helper'
-begin
-  require 'eventmachine'
+if defined? EventMachine
+  require 'spec_helper'
   require 'mysql2/em'
 
   describe Mysql2::EM::Client do
     it "should support async queries" do
       results = []
       EM.run do
-        client1 = Mysql2::EM::Client.new DatabaseCredentials['root']
+        client1 = Mysql2::EM::Client.new
         defer1 = client1.query "SELECT sleep(0.1) as first_query"
         defer1.callback do |result|
           results << result.first
-          client1.close
           EM.stop_event_loop
         end
 
-        client2 = Mysql2::EM::Client.new DatabaseCredentials['root']
+        client2 = Mysql2::EM::Client.new
         defer2 = client2.query "SELECT sleep(0.025) second_query"
         defer2.callback do |result|
           results << result.first
-          client2.close
         end
       end
 
@@ -31,14 +28,13 @@ begin
     it "should support queries in callbacks" do
       results = []
       EM.run do
-        client = Mysql2::EM::Client.new DatabaseCredentials['root']
+        client = Mysql2::EM::Client.new
         defer1 = client.query "SELECT sleep(0.025) as first_query"
         defer1.callback do |result|
           results << result.first
           defer2 = client.query "SELECT sleep(0.025) as second_query"
-          defer2.callback do |r|
-            results << r.first
-            client.close
+          defer2.callback do |result|
+            results << result.first
             EM.stop_event_loop
           end
         end
@@ -47,68 +43,7 @@ begin
       results[0].keys.should include("first_query")
       results[1].keys.should include("second_query")
     end
-
-    it "should not swallow exceptions raised in callbacks" do
-      lambda {
-        EM.run do
-          client = Mysql2::EM::Client.new DatabaseCredentials['root']
-          defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do |result|
-            client.close
-            raise 'some error'
-          end
-          defer.errback do |err|
-            # This _shouldn't_ be run, but it needed to prevent the specs from
-            # freezing if this test fails.
-            EM.stop_event_loop
-          end
-        end
-      }.should raise_error
-    end
-
-    context 'when an exception is raised by the client' do
-      let(:client) { Mysql2::EM::Client.new DatabaseCredentials['root'] }
-      let(:error) { StandardError.new('some error') }
-      before { client.stub(:async_result).and_raise(error) }
-
-      it "should swallow exceptions raised in by the client" do
-        errors = []
-        EM.run do
-          defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do |result|
-            # This _shouldn't_ be run, but it is needed to prevent the specs from
-            # freezing if this test fails.
-            EM.stop_event_loop
-          end
-          defer.errback do |err|
-            errors << err
-            EM.stop_event_loop
-          end
-        end
-        errors.should == [error]
-      end
-
-      it "should fail the deferrable" do
-        callbacks_run = []
-        EM.run do
-          defer = client.query "SELECT sleep(0.025) as first_query"
-          EM.add_timer(0.1) do
-            defer.callback do |result|
-              callbacks_run << :callback
-              # This _shouldn't_ be run, but it is needed to prevent the specs from
-              # freezing if this test fails.
-              EM.stop_event_loop
-            end
-            defer.errback do |err|
-              callbacks_run << :errback
-              EM.stop_event_loop
-            end
-          end
-        end
-        callbacks_run.should == [:errback]
-      end
-    end
   end
-rescue LoadError
+else
   puts "EventMachine not installed, skipping the specs that use it"
-end
+end

data/spec/mysql2/client_spec.rb

@@ -2,47 +2,16 @@
 require 'spec_helper'
 
 describe Mysql2::Client do
-  context "using defaults file" do
-    let(:cnf_file) { File.expand_path('../../my.cnf', __FILE__) }
-
-    it "should not raise an exception for valid defaults group" do
-      lambda {
-        opts = DatabaseCredentials['root'].merge(:default_file => cnf_file, :default_group => "test")
-        @client = Mysql2::Client.new(opts)
-      }.should_not raise_error(Mysql2::Error)
-    end
-
-    it "should not raise an exception without default group" do
-      lambda {
-        @client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:default_file => cnf_file))
-      }.should_not raise_error(Mysql2::Error)
-    end
-  end
-
-  it "should raise an exception upon connection failure" do
-    lambda {
-      # The odd local host IP address forces the mysql client library to
-      # use a TCP socket rather than a domain socket.
-      Mysql2::Client.new DatabaseCredentials['root'].merge('host' => '127.0.0.2', 'port' => 999999)
-    }.should raise_error(Mysql2::Error)
+  before(:each) do
+    @client = Mysql2::Client.new
   end
 
   if defined? Encoding
     it "should raise an exception on create for invalid encodings" do
       lambda {
-        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
+        c = Mysql2::Client.new(:encoding => "fake")
       }.should raise_error(Mysql2::Error)
     end
-
-    it "should not raise an exception on create for a valid encoding" do
-      lambda {
-        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
-      }.should_not raise_error(Mysql2::Error)
-
-      lambda {
-        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
-      }.should_not raise_error(Mysql2::Error)
-    end
   end
 
   it "should accept connect flags and pass them to #connect" do
@@ -54,7 +23,7 @@ describe Mysql2::Client do
       end
     end
     client = klient.new :flags => Mysql2::Client::FOUND_ROWS
-    (client.connect_args.last[6] & Mysql2::Client::FOUND_ROWS).should be_true
+    (client.connect_args.last.last & Mysql2::Client::FOUND_ROWS).should be_true
   end
 
   it "should default flags to (REMEMBER_OPTIONS, LONG_PASSWORD, LONG_FLAG, TRANSACTIONS, PROTOCOL_41, SECURE_CONNECTION)" do
@@ -66,7 +35,7 @@ describe Mysql2::Client do
       end
     end
     client = klient.new
-    (client.connect_args.last[6] & (Mysql2::Client::REMEMBER_OPTIONS |
+    (client.connect_args.last.last & (Mysql2::Client::REMEMBER_OPTIONS |
                                      Mysql2::Client::LONG_PASSWORD |
                                      Mysql2::Client::LONG_FLAG |
                                      Mysql2::Client::TRANSACTIONS |
@@ -74,66 +43,19 @@ describe Mysql2::Client do
                                      Mysql2::Client::SECURE_CONNECTION)).should be_true
   end
 
-  it "should execute init command" do
-    options = DatabaseCredentials['root'].dup
-    options[:init_command] = "SET @something = 'setting_value';"
-    client = Mysql2::Client.new(options)
-    result = client.query("SELECT @something;")
-    result.first['@something'].should eq('setting_value')
-  end
-
-  it "should send init_command after reconnect" do
-    options = DatabaseCredentials['root'].dup
-    options[:init_command] = "SET @something = 'setting_value';"
-    options[:reconnect] = true
-    client = Mysql2::Client.new(options)
-
-    result = client.query("SELECT @something;")
-    result.first['@something'].should eq('setting_value')
-
-    # get the current connection id
-    result = client.query("SELECT CONNECTION_ID()")
-    first_conn_id = result.first['CONNECTION_ID()']
-
-    # break the current connection
-    begin
-      client.query("KILL #{first_conn_id}")
-    rescue Mysql2::Error
-    end
-
-    client.ping # reconnect now
-
-    # get the new connection id
-    result = client.query("SELECT CONNECTION_ID()")
-    second_conn_id = result.first['CONNECTION_ID()']
-
-    # confirm reconnect by checking the new connection id
-    first_conn_id.should_not == second_conn_id
-
-    # At last, check that the init command executed
-    result = client.query("SELECT @something;")
-    result.first['@something'].should eq('setting_value')
-  end
-
   it "should have a global default_query_options hash" do
     Mysql2::Client.should respond_to(:default_query_options)
   end
 
   it "should be able to connect via SSL options" do
-    ssl = @client.query "SHOW VARIABLES LIKE 'have_ssl'"
-    ssl_uncompiled = ssl.any? {|x| x['Value'] == 'OFF'}
-    pending("DON'T WORRY, THIS TEST PASSES - but SSL is not compiled into your MySQL daemon.") if ssl_uncompiled
-    ssl_disabled = ssl.any? {|x| x['Value'] == 'DISABLED'}
-    pending("DON'T WORRY, THIS TEST PASSES - but SSL is not enabled in your MySQL daemon.") if ssl_disabled
-
-    # You may need to adjust the lines below to match your SSL certificate paths
+    pending("DON'T WORRY, THIS TEST PASSES :) - but is machine-specific. You need to have MySQL running with SSL configured and enabled. Then update the paths in this test to your needs and remove the pending state.")
     ssl_client = nil
     lambda {
       ssl_client = Mysql2::Client.new(
-        :sslkey    => '/etc/mysql/client-key.pem',
-        :sslcert   => '/etc/mysql/client-cert.pem',
-        :sslca     => '/etc/mysql/ca-cert.pem',
-        :sslcapath => '/etc/mysql/',
+        :sslkey => '/path/to/client-key.pem',
+        :sslcert => '/path/to/client-cert.pem',
+        :sslca => '/path/to/ca-cert.pem',
+        :sslcapath => '/path/to/newcerts/',
         :sslcipher => 'DHE-RSA-AES256-SHA'
       )
     }.should_not raise_error(Mysql2::Error)
@@ -141,64 +63,11 @@ describe Mysql2::Client do
     results = ssl_client.query("SHOW STATUS WHERE Variable_name = \"Ssl_version\" OR Variable_name = \"Ssl_cipher\"").to_a
     results[0]['Variable_name'].should eql('Ssl_cipher')
     results[0]['Value'].should_not be_nil
-    results[0]['Value'].should be_kind_of(String)
-    results[0]['Value'].should_not be_empty
+    results[0]['Value'].class.should eql(String)
 
     results[1]['Variable_name'].should eql('Ssl_version')
     results[1]['Value'].should_not be_nil
-    results[1]['Value'].should be_kind_of(String)
-    results[1]['Value'].should_not be_empty
-
-    ssl_client.close
-  end
-
-  it "should not leave dangling connections after garbage collection" do
-    GC.start
-    sleep 0.300 # Let GC do its work
-    client = Mysql2::Client.new(DatabaseCredentials['root'])
-    before_count = client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
-
-    10.times do
-      Mysql2::Client.new(DatabaseCredentials['root']).query('SELECT 1')
-    end
-    after_count = client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
-    after_count.should == before_count + 10
-
-    GC.start
-    sleep 0.300 # Let GC do its work
-    final_count = client.query("SHOW STATUS LIKE 'Threads_connected'").first['Value'].to_i
-    final_count.should == before_count
-  end
-
-  if Process.respond_to?(:fork)
-    it "should not close connections when running in a child process" do
-      GC.start
-      sleep 1 if defined? Rubinius # Let the rbx GC thread do its work
-      client = Mysql2::Client.new(DatabaseCredentials['root'])
-
-      fork do
-        client.query('SELECT 1')
-        client = nil
-        GC.start
-        sleep 1 if defined? Rubinius # Let the rbx GC thread do its work
-      end
-
-      Process.wait
-
-      # this will throw an error if the underlying socket was shutdown by the
-      # child's GC
-      expect { client.query('SELECT 1') }.to_not raise_exception
-    end
-  end
-
-  it "should be able to connect to database with numeric-only name" do
-    lambda {
-      creds = DatabaseCredentials['numericuser']
-      @client.query "CREATE DATABASE IF NOT EXISTS `#{creds['database']}`"
-      @client.query "GRANT ALL ON `#{creds['database']}`.* TO #{creds['username']}@`#{creds['host']}`"
-      client = Mysql2::Client.new creds
-      @client.query "DROP DATABASE IF EXISTS `#{creds['database']}`"
-    }.should_not raise_error
+    results[1]['Value'].class.should eql(String)
   end
 
   it "should respond to #close" do
@@ -216,160 +85,22 @@ describe Mysql2::Client do
     @client.should respond_to(:query)
   end
 
-  it "should respond to #warning_count" do
-    @client.should respond_to(:warning_count)
-  end
-
-  context "#warning_count" do
-    context "when no warnings" do
-      it "should 0" do
-        @client.query('select 1')
-        @client.warning_count.should == 0
-      end
-    end
-    context "when has a warnings" do
-      it "should > 0" do
-        # "the statement produces extra information that can be viewed by issuing a SHOW WARNINGS"
-        # http://dev.mysql.com/doc/refman/5.0/en/explain-extended.html
-        @client.query("explain extended select 1")
-        @client.warning_count.should > 0
-      end
-    end
-  end
-
-  it "should respond to #query_info" do
-    @client.should respond_to(:query_info)
-  end
-
-  context "#query_info" do
-    context "when no info present" do
-      it "should 0" do
-        @client.query('select 1')
-        @client.query_info.should be_empty
-        @client.query_info_string.should be_nil
-      end
-    end
-    context "when has some info" do
-      it "should retrieve it" do
-        @client.query "USE test"
-        @client.query "CREATE TABLE IF NOT EXISTS infoTest (`id` int(11) NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
-
-        # http://dev.mysql.com/doc/refman/5.0/en/mysql-info.html says
-        # # 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)")
-
-        @client.query_info.should  eql({:records => 2, :duplicates => 0, :warnings => 0})
-        @client.query_info_string.should eq('Records: 2  Duplicates: 0  Warnings: 0')
-
-        @client.query "DROP TABLE infoTest"
-      end
-    end
-  end
-
-  context ":local_infile" do
-    before(:all) do
-      @client_i = Mysql2::Client.new DatabaseCredentials['root'].merge(:local_infile => true)
-      local = @client_i.query "SHOW VARIABLES LIKE 'local_infile'"
-      local_enabled = local.any? {|x| x['Value'] == 'ON'}
-      pending("DON'T WORRY, THIS TEST PASSES - but LOCAL INFILE is not enabled in your MySQL daemon.") unless local_enabled
-
-      @client_i.query %[
-        CREATE TABLE IF NOT EXISTS infileTest (
-          id MEDIUMINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
-          foo VARCHAR(10),
-          bar MEDIUMTEXT
-        )
-      ]
-    end
-
-    after(:all) do
-      @client_i.query "DROP TABLE infileTest"
-    end
-
-    it "should raise an error when local_infile is disabled" do
-      client = Mysql2::Client.new DatabaseCredentials['root'].merge(:local_infile => false)
-      lambda {
-        client.query "LOAD DATA LOCAL INFILE 'spec/test_data' INTO TABLE infileTest"
-      }.should raise_error(Mysql2::Error, %r{command is not allowed})
-    end
-
-    it "should raise an error when a non-existent file is loaded" do
-      lambda {
-        @client_i.query "LOAD DATA LOCAL INFILE 'this/file/is/not/here' INTO TABLE infileTest"
-      }.should_not raise_error(Mysql2::Error, %r{file not found: this/file/is/not/here})
-    end
-
-    it "should LOAD DATA LOCAL INFILE" do
-      @client_i.query "LOAD DATA LOCAL INFILE 'spec/test_data' INTO TABLE infileTest"
-      info = @client_i.query_info
-      info.should eql({:records => 1, :deleted => 0, :skipped => 0, :warnings => 0})
-
-      result = @client_i.query "SELECT * FROM infileTest"
-      result.first.should eql({'id' => 1, 'foo' => 'Hello', 'bar' => 'World'})
-    end
-  end
-
-  it "should expect connect_timeout to be a positive integer" do
-    lambda {
-      Mysql2::Client.new(:connect_timeout => -1)
-    }.should raise_error(Mysql2::Error)
-  end
-
   it "should expect read_timeout to be a positive integer" do
     lambda {
       Mysql2::Client.new(:read_timeout => -1)
     }.should raise_error(Mysql2::Error)
   end
 
-  it "should expect write_timeout to be a positive integer" do
-    lambda {
-      Mysql2::Client.new(:write_timeout => -1)
-    }.should raise_error(Mysql2::Error)
-  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
-
-      expect {
-        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
-      }.to_not raise_exception(Mysql2::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
-
-      expect {
-        @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false)
-      }.to raise_exception(Mysql2::Error)
-    end
-
     it "should only accept strings as the query parameter" do
       lambda {
         @client.query ["SELECT 'not right'"]
       }.should 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
-      @client.query_options[:something].should be_nil
-      result.instance_variable_get('@query_options').should eql(@client.query_options.merge(:something => :else))
-      @client.instance_variable_get('@current_query_options').should eql(@client.query_options.merge(:something => :else))
-
-      result = @client.query "SELECT 1"
-      result.instance_variable_get('@query_options').should eql(@client.query_options)
-      @client.instance_variable_get('@current_query_options').should eql(@client.query_options)
-    end
-
-    it "should allow changing query options for subsequent queries" do
-      @client.query_options.merge!(:something => :else)
-      result = @client.query "SELECT 1"
-      @client.query_options[:something].should eql(:else)
-      result.instance_variable_get('@query_options')[:something].should eql(:else)
-
-      # Clean up after this test
-      @client.query_options.delete(:something)
-      @client.query_options[:something].should be_nil
+    it "should accept an options hash that inherits from Mysql2::Client.default_query_options" do
+      @client.query "SELECT 1", :something => :else
+      @client.query_options.should eql(@client.query_options.merge(:something => :else))
     end
 
     it "should return results as a hash by default" do
@@ -385,6 +116,13 @@ describe Mysql2::Client do
       @client.query("SELECT 1", :symbolize_keys => true).first.keys[0].class.should eql(Symbol)
     end
 
+    it "should not allow another query to be sent without fetching a result first" do
+      @client.query("SELECT 1", :async => true)
+      lambda {
+        @client.query("SELECT 1")
+      }.should raise_error(Mysql2::Error)
+    end
+
     it "should require an open connection" do
       @client.close
       lambda {
@@ -392,241 +130,41 @@ describe Mysql2::Client do
       }.should raise_error(Mysql2::Error)
     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)
-        lambda {
-          @client.query("SELECT 1")
-        }.should 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.join
-        begin
-          @client.query("SELECT 1")
-        rescue Mysql2::Error => e
-          message = e.message
-        end
-        re = Regexp.escape(thr.inspect)
-        message.should match(Regexp.new(re))
-      end
-
-      it "should timeout if we wait longer than :read_timeout" do
-        client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:read_timeout => 1))
-        lambda {
-          client.query("SELECT sleep(2)")
-        }.should raise_error(Mysql2::Error)
-      end
-
-      if !defined? Rubinius
-        # XXX this test is not deterministic (because Unix signal handling is not)
-        # and may fail on a loaded system
-        it "should run signal handlers while waiting for a response" do
-          mark = {}
-          trap(:USR1) { mark[:USR1] = Time.now }
-          begin
-            mark[:START] = Time.now
-            pid = fork do
-              sleep 1 # wait for client "SELECT sleep(2)" query to start
-              Process.kill(:USR1, Process.ppid)
-              sleep # wait for explicit kill to prevent GC disconnect
-            end
-            @client.query("SELECT sleep(2)")
-            mark[:END] = Time.now
-            mark.include?(:USR1).should be_true
-            (mark[:USR1] - mark[:START]).should >= 1
-            (mark[:USR1] - mark[:START]).should < 1.3
-            (mark[:END] - mark[:USR1]).should > 0.9
-            (mark[:END] - mark[:START]).should >= 2
-            (mark[:END] - mark[:START]).should < 2.3
-            Process.kill(:TERM, pid)
-            Process.waitpid2(pid)
-          ensure
-            trap(:USR1, 'DEFAULT')
-          end
-        end
-      end
-
-      it "#socket should return a Fixnum (file descriptor from C)" do
-        @client.socket.class.should eql(Fixnum)
-        @client.socket.should_not eql(0)
-      end
-
-      it "#socket should require an open connection" do
-        @client.close
-        lambda {
-          @client.socket
-        }.should raise_error(Mysql2::Error)
-      end
-
-      it "should close the connection when an exception is raised" do
-        begin
-          Timeout.timeout(1, Timeout::Error) do
-            @client.query("SELECT sleep(2)")
-          end
-        rescue Timeout::Error
-        end
-
-        lambda {
-          @client.query("SELECT 1")
-        }.should raise_error(Mysql2::Error, 'closed MySQL connection')
-      end
-
-      it "should handle Timeouts without leaving the connection hanging if reconnect is true" do
-        client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:reconnect => true))
-        begin
-          Timeout.timeout(1, Timeout::Error) do
-            client.query("SELECT sleep(2)")
-          end
-        rescue Timeout::Error
-        end
-
-        lambda {
-          client.query("SELECT 1")
-        }.should_not raise_error(Mysql2::Error)
-      end
-
-      it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction true" do
-        client = Mysql2::Client.new(DatabaseCredentials['root'])
-        begin
-          Timeout.timeout(1, Timeout::Error) do
-            client.query("SELECT sleep(2)")
-          end
-        rescue Timeout::Error
-        end
-
-        lambda {
-          client.query("SELECT 1")
-        }.should raise_error(Mysql2::Error)
-
-        client.reconnect = true
+    it "should timeout if we wait longer than :read_timeout" do
+      client = Mysql2::Client.new(:read_timeout => 1)
+      lambda {
+        client.query("SELECT sleep(2)")
+      }.should raise_error(Mysql2::Error)
+    end
 
+    # XXX this test is not deterministic (because Unix signal handling is not)
+    # and may fail on a loaded system
+    if RUBY_PLATFORM !~ /mingw|mswin/
+      it "should run signal handlers while waiting for a response" do
+        mark = {}
+        trap(:USR1) { mark[:USR1] = Time.now }
         begin
-          Timeout.timeout(1, Timeout::Error) do
-            client.query("SELECT sleep(2)")
-          end
-        rescue Timeout::Error
-        end
-
-        lambda {
-          client.query("SELECT 1")
-        }.should_not raise_error(Mysql2::Error)
-
-      end
-
-      it "threaded queries should be supported" do
-        threads, results = [], {}
-        lock = Mutex.new
-        connect = lambda{
-          Mysql2::Client.new(DatabaseCredentials['root'])
-        }
-        Timeout.timeout(0.7) do
-          5.times {
-            threads << Thread.new do
-              result = connect.call.query("SELECT sleep(0.5) as result")
-              lock.synchronize do
-                results[Thread.current.object_id] = result
-              end
-            end
-          }
-        end
-        threads.each{|t| t.join }
-        results.keys.sort.should eql(threads.map{|t| t.object_id }.sort)
-      end
-
-      it "evented async queries should be supported" do
-        # should immediately return nil
-        @client.query("SELECT sleep(0.1)", :async => true).should eql(nil)
-
-        io_wrapper = IO.for_fd(@client.socket)
-        loops = 0
-        loop do
-          if IO.select([io_wrapper], nil, nil, 0.05)
-            break
-          else
-            loops += 1
+          mark[:START] = Time.now
+          pid = fork do
+            sleep 1 # wait for client "SELECT sleep(2)" query to start
+            Process.kill(:USR1, Process.ppid)
+            sleep # wait for explicit kill to prevent GC disconnect
           end
+          @client.query("SELECT sleep(2)")
+          mark[:END] = Time.now
+          mark.include?(:USR1).should be_true
+          (mark[:USR1] - mark[:START]).should >= 1
+          (mark[:USR1] - mark[:START]).should < 1.1
+          (mark[:END] - mark[:USR1]).should > 0.9
+          (mark[:END] - mark[:START]).should >= 2
+          (mark[:END] - mark[:START]).should < 2.1
+          Process.kill(:TERM, pid)
+          Process.waitpid2(pid)
+        ensure
+          trap(:USR1, 'DEFAULT')
         end
-
-        # make sure we waited some period of time
-        (loops >= 1).should be_true
-
-        result = @client.async_result
-        result.class.should eql(Mysql2::Result)
       end
     end
-
-    context "Multiple results sets" do
-      before(:each) do
-        @multi_client = Mysql2::Client.new(DatabaseCredentials['root'].merge(: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';")
-        result.first['set_1'].should be(1)
-        lambda {
-          @multi_client.next_result
-        }.should raise_error(Mysql2::Error)
-        @multi_client.next_result.should be_false
-      end
-
-      it "returns multiple result sets" do
-        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should eql({ 'set_1' => 1 })
-
-        @multi_client.next_result.should be_true
-        @multi_client.store_result.first.should eql({ 'set_2' => 2 })
-
-        @multi_client.next_result.should be_false
-      end
-
-      it "does not interfere with other statements" do
-        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
-        while( @multi_client.next_result )
-          @multi_client.store_result
-        end
-
-        @multi_client.query( "select 3 as 'next'").first.should == { 'next' => 3 }
-      end
-
-      it "will raise on query if there are outstanding results to read" do
-        @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
-        lambda {
-          @multi_client.query("SELECT 4")
-        }.should raise_error(Mysql2::Error)
-      end
-
-      it "#abandon_results! should work" do
-        @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
-        @multi_client.abandon_results!
-        lambda {
-          @multi_client.query("SELECT 4")
-        }.should_not raise_error(Mysql2::Error)
-      end
-
-      it "#more_results? should work" do
-        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
-        @multi_client.more_results?.should be_true
-
-        @multi_client.next_result
-        @multi_client.store_result
-
-        @multi_client.more_results?.should be_false
-      end
-    end
-  end
-
-  it "should respond to #socket" do
-    @client.should respond_to(:socket)
-  end
-
-  if RUBY_PLATFORM =~ /mingw|mswin/
-    it "#socket should raise as it's not supported" do
-      lambda {
-        @client.socket
-      }.should raise_error(Mysql2::Error)
-    end
   end
 
   it "should respond to escape" do
@@ -655,7 +193,7 @@ describe Mysql2::Client do
       }.should_not raise_error(SystemStackError)
     end
 
-    unless RUBY_VERSION =~ /1.8/
+    if RUBY_VERSION =~ /1.9/
       it "should carry over the original string's encoding" do
         str = "abc'def\"ghi\0jkl%mno"
         escaped = Mysql2::Client.escape(str)
@@ -718,22 +256,18 @@ describe Mysql2::Client do
   if defined? Encoding
     context "strings returned by #info" do
       it "should default to the connection's encoding if Encoding.default_internal is nil" do
-        with_internal_encoding nil do
-          @client.info[:version].encoding.should eql(Encoding.find('utf-8'))
+        Encoding.default_internal = nil
+        @client.info[:version].encoding.should eql(Encoding.find('utf-8'))
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
-          client2.info[:version].encoding.should eql(Encoding.find('us-ascii'))
-        end
+        client2 = Mysql2::Client.new :encoding => 'ascii'
+        client2.info[:version].encoding.should eql(Encoding.find('us-ascii'))
       end
 
       it "should use Encoding.default_internal" do
-        with_internal_encoding 'utf-8' do
-          @client.info[:version].encoding.should eql(Encoding.default_internal)
-        end
-
-        with_internal_encoding 'us-ascii' do
-          @client.info[:version].encoding.should eql(Encoding.default_internal)
-        end
+        Encoding.default_internal = Encoding.find('utf-8')
+        @client.info[:version].encoding.should eql(Encoding.default_internal)
+        Encoding.default_internal = Encoding.find('us-ascii')
+        @client.info[:version].encoding.should eql(Encoding.default_internal)
       end
     end
   end
@@ -761,40 +295,87 @@ describe Mysql2::Client do
   if defined? Encoding
     context "strings returned by #server_info" do
       it "should default to the connection's encoding if Encoding.default_internal is nil" do
-        with_internal_encoding nil do
-          @client.server_info[:version].encoding.should eql(Encoding.find('utf-8'))
+        Encoding.default_internal = nil
+        @client.server_info[:version].encoding.should eql(Encoding.find('utf-8'))
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
-          client2.server_info[:version].encoding.should eql(Encoding.find('us-ascii'))
-        end
+        client2 = Mysql2::Client.new :encoding => 'ascii'
+        client2.server_info[:version].encoding.should eql(Encoding.find('us-ascii'))
       end
 
       it "should use Encoding.default_internal" do
-        with_internal_encoding 'utf-8' do
-          @client.server_info[:version].encoding.should eql(Encoding.default_internal)
-        end
-
-        with_internal_encoding 'us-ascii' do
-          @client.server_info[:version].encoding.should eql(Encoding.default_internal)
-        end
+        Encoding.default_internal = Encoding.find('utf-8')
+        @client.server_info[:version].encoding.should eql(Encoding.default_internal)
+        Encoding.default_internal = Encoding.find('us-ascii')
+        @client.server_info[:version].encoding.should eql(Encoding.default_internal)
       end
     end
   end
 
+  it "should respond to #socket" do
+    @client.should respond_to(:socket)
+  end
+
+  it "#socket should return a Fixnum (file descriptor from C)" do
+    @client.socket.class.should eql(Fixnum)
+    @client.socket.should_not eql(0)
+  end
+
+  it "#socket should require an open connection" do
+    @client.close
+    lambda {
+      @client.socket
+    }.should raise_error(Mysql2::Error)
+  end
+
   it "should raise a Mysql2::Error exception upon connection failure" do
     lambda {
-      Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
+      bad_client = Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
     }.should raise_error(Mysql2::Error)
 
     lambda {
-      Mysql2::Client.new DatabaseCredentials['root']
+      good_client = Mysql2::Client.new
     }.should_not raise_error(Mysql2::Error)
   end
 
+  it "threaded queries should be supported" do
+    threads, results = [], {}
+    connect = lambda{ Mysql2::Client.new(:host => "localhost", :username => "root") }
+    Timeout.timeout(0.7) do
+      5.times {
+        threads << Thread.new do
+          results[Thread.current.object_id] = connect.call.query("SELECT sleep(0.5) as result")
+        end
+      }
+    end
+    threads.each{|t| t.join }
+    results.keys.sort.should eql(threads.map{|t| t.object_id }.sort)
+  end
+
+  it "evented async queries should be supported" do
+    # should immediately return nil
+    @client.query("SELECT sleep(0.1)", :async => true).should eql(nil)
+
+    io_wrapper = IO.for_fd(@client.socket)
+    loops = 0
+    loop do
+      if IO.select([io_wrapper], nil, nil, 0.05)
+        break
+      else
+        loops += 1
+      end
+    end
+
+    # make sure we waited some period of time
+    (loops >= 1).should be_true
+
+    result = @client.async_result
+    result.class.should eql(Mysql2::Result)
+  end
+
   context 'write operations api' do
     before(:each) do
       @client.query "USE test"
-      @client.query "CREATE TABLE IF NOT EXISTS lastIdTest (`id` BIGINT NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
+      @client.query "CREATE TABLE lastIdTest (`id` int(11) NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
     end
 
     after(:each) do
@@ -821,15 +402,6 @@ describe Mysql2::Client do
       @client.query "UPDATE lastIdTest SET blah=4321 WHERE id=1"
       @client.affected_rows.should eql(1)
     end
-
-    it "#last_id should handle BIGINT auto-increment ids above 32 bits" do
-      # The id column type must be BIGINT. Surprise: INT(x) is limited to 32-bits for all values of x.
-      # Insert a row with a given ID, this should raise the auto-increment state
-      @client.query "INSERT INTO lastIdTest (id, blah) VALUES (5000000000, 5000)"
-      @client.last_id.should eql(5000000000)
-      @client.query "INSERT INTO lastIdTest (blah) VALUES (5001)"
-      @client.last_id.should eql(5000000001)
-    end
   end
 
   it "should respond to #thread_id" do
@@ -844,54 +416,15 @@ describe Mysql2::Client do
     @client.should respond_to(:ping)
   end
 
-  context "select_db" do
-    before(:each) do
-      2.times do |i|
-        @client.query("CREATE DATABASE test_selectdb_#{i}")
-        @client.query("USE test_selectdb_#{i}")
-        @client.query("CREATE TABLE test#{i} (`id` int NOT NULL PRIMARY KEY)")
-      end
-    end
-
-    after(:each) do
-      2.times do |i|
-        @client.query("DROP DATABASE test_selectdb_#{i}")
-      end
-    end
-
-    it "should respond to #select_db" do
-      @client.should respond_to(:select_db)
-    end
-
-    it "should switch databases" do
-      @client.select_db("test_selectdb_0")
-      @client.query("SHOW TABLES").first.values.first.should eql("test0")
-      @client.select_db("test_selectdb_1")
-      @client.query("SHOW TABLES").first.values.first.should eql("test1")
-      @client.select_db("test_selectdb_0")
-      @client.query("SHOW TABLES").first.values.first.should eql("test0")
-    end
-
-    it "should raise a Mysql2::Error when the database doesn't exist" do
-      lambda {
-        @client.select_db("nopenothere")
-      }.should raise_error(Mysql2::Error)
-    end
-
-    it "should return the database switched to" do
-      @client.select_db("test_selectdb_1").should eq("test_selectdb_1")
-    end
-  end
-
   it "#thread_id should return a boolean" do
     @client.ping.should eql(true)
     @client.close
     @client.ping.should eql(false)
   end
 
-  unless RUBY_VERSION =~ /1.8/
-    it "should respond to #encoding" do
-      @client.should respond_to(:encoding)
-    end
+if RUBY_VERSION =~ /1.9/
+  it "should respond to #encoding" do
+    @client.should respond_to(:encoding)
   end
 end
+end