mysql2 0.3.1 → 0.5.2

data/spec/mysql2/error_spec.rb

@@ -1,68 +1,77 @@
-# encoding: UTF-8
 require 'spec_helper'
 
-describe Mysql2::Error do
-  before(:each) do
-    @client = Mysql2::Client.new :encoding => "utf8"
+RSpec.describe Mysql2::Error do
+  let(:error) do
     begin
       @client.query("HAHAHA")
     rescue Mysql2::Error => e
-      @error = e
+      error = e
     end
 
-    @client2 = Mysql2::Client.new :encoding => "big5"
-    begin
-      @client2.query("HAHAHA")
-    rescue Mysql2::Error => e
-      @error2 = e
-    end
+    error
   end
 
-  it "should respond to #error_number" do
-    @error.should respond_to(:error_number)
-  end
+  it "responds to error_number and sql_state, with aliases" do
+    expect(error).to respond_to(:error_number)
+    expect(error).to respond_to(:sql_state)
 
-  it "should respond to #sql_state" do
-    @error.should respond_to(:sql_state)
+    # Mysql gem compatibility
+    expect(error).to respond_to(:errno)
+    expect(error).to respond_to(:error)
   end
 
-  # Mysql gem compatibility
-  it "should alias #error_number to #errno" do
-    @error.should respond_to(:errno)
-  end
-
-  it "should alias #message to #error" do
-    @error.should respond_to(:error)
-  end
+  context 'encoding' do
+    let(:valid_utf8) { '造字' }
+    let(:error) do
+      begin
+        @client.query(valid_utf8)
+      rescue Mysql2::Error => e
+        e
+      end
+    end
 
-  if RUBY_VERSION =~ /1.9/
-    it "#message encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.message.encoding.should eql(@client.encoding)
-        @error2.message.encoding.should eql(@client2.encoding)
-      else
-        @error.message.encoding.should eql(Encoding.default_internal)
-        @error2.message.encoding.should eql(Encoding.default_internal)
+    let(:invalid_utf8) { ["e5c67d1f"].pack('H*').force_encoding(Encoding::UTF_8) }
+    let(:bad_err) do
+      begin
+        @client.query(invalid_utf8)
+      rescue Mysql2::Error => e
+        e
       end
     end
 
-    it "#error encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.error.encoding.should eql(@client.encoding)
-        @error2.error.encoding.should eql(@client2.encoding)
-      else
-        @error.error.encoding.should eql(Encoding.default_internal)
-        @error2.error.encoding.should eql(Encoding.default_internal)
+    before do
+      # sanity check
+      expect(valid_utf8.encoding).to eql(Encoding::UTF_8)
+      expect(valid_utf8).to be_valid_encoding
+
+      expect(invalid_utf8.encoding).to eql(Encoding::UTF_8)
+      expect(invalid_utf8).to_not be_valid_encoding
+    end
+
+    it "returns error messages as UTF-8 by default" do
+      with_internal_encoding nil do
+        expect(error.message.encoding).to eql(Encoding::UTF_8)
+        expect(error.message).to be_valid_encoding
+
+        expect(bad_err.message.encoding).to eql(Encoding::UTF_8)
+        expect(bad_err.message).to be_valid_encoding
+
+        expect(bad_err.message).to include("??}\u001F")
       end
     end
 
-    it "#sql_state encoding should match the connection's encoding, or Encoding.default_internal if set" do
-      if Encoding.default_internal.nil?
-        @error.sql_state.encoding.should eql(@client.encoding)
-        @error2.sql_state.encoding.should eql(@client2.encoding)
-      else
-        @error.sql_state.encoding.should eql(Encoding.default_internal)
-        @error2.sql_state.encoding.should eql(Encoding.default_internal)
+    it "returns sql state as ASCII" do
+      expect(error.sql_state.encoding).to eql(Encoding::US_ASCII)
+      expect(error.sql_state).to be_valid_encoding
+    end
+
+    it "returns error messages and sql state in Encoding.default_internal if set" do
+      with_internal_encoding Encoding::UTF_16LE do
+        expect(error.message.encoding).to eql(Encoding.default_internal)
+        expect(error.message).to be_valid_encoding
+
+        expect(bad_err.message.encoding).to eql(Encoding.default_internal)
+        expect(bad_err.message).to be_valid_encoding
       end
     end
   end

data/spec/mysql2/result_spec.rb

@@ -1,271 +1,404 @@
-# encoding: UTF-8
 require 'spec_helper'
 
-describe Mysql2::Result do
+RSpec.describe Mysql2::Result do
   before(:each) do
-    @client = Mysql2::Client.new :host => "localhost", :username => "root", :database => 'test'
+    @result = @client.query "SELECT 1"
   end
 
-  before(:each) do
-    @result = @client.query "SELECT 1"
+  it "should raise a TypeError exception when it doesn't wrap a result set" do
+    r = Mysql2::Result.new
+    expect { r.count }.to raise_error(TypeError)
+    expect { r.fields }.to raise_error(TypeError)
+    expect { r.size }.to raise_error(TypeError)
+    expect { r.each }.to raise_error(TypeError)
   end
 
   it "should have included Enumerable" do
-    Mysql2::Result.ancestors.include?(Enumerable).should be_true
+    expect(Mysql2::Result.ancestors.include?(Enumerable)).to be true
   end
 
   it "should respond to #each" do
-    @result.should respond_to(:each)
+    expect(@result).to respond_to(:each)
+  end
+
+  it "should respond to #free" do
+    expect(@result).to respond_to(:free)
   end
 
   it "should raise a Mysql2::Error exception upon a bad query" do
-    lambda {
+    expect do
       @client.query "bad sql"
-    }.should raise_error(Mysql2::Error)
+    end.to raise_error(Mysql2::Error)
 
-    lambda {
+    expect do
       @client.query "SELECT 1"
-    }.should_not raise_error(Mysql2::Error)
+    end.not_to raise_error
+  end
+
+  it "should respond to #count, which is aliased as #size" do
+    r = @client.query "SELECT 1"
+    expect(r).to respond_to :count
+    expect(r).to respond_to :size
+  end
+
+  it "should be able to return the number of rows in the result set" do
+    r = @client.query "SELECT 1"
+    expect(r.count).to eql(1)
+    expect(r.size).to eql(1)
+  end
+
+  context "metadata queries" do
+    it "should show tables" do
+      @result = @client.query "SHOW TABLES"
+    end
   end
 
   context "#each" do
     it "should yield rows as hash's" do
       @result.each do |row|
-        row.class.should eql(Hash)
+        expect(row).to be_an_instance_of(Hash)
       end
     end
 
     it "should yield rows as hash's with symbol keys if :symbolize_keys was set to true" do
-      @result.each(:symbolize_keys => true) do |row|
-        row.keys.first.class.should eql(Symbol)
+      @result.each(symbolize_keys: true) do |row|
+        expect(row.keys.first).to be_an_instance_of(Symbol)
       end
     end
 
     it "should be able to return results as an array" do
-      @result.each(:as => :array) do |row|
-        row.class.should eql(Array)
+      @result.each(as: :array) do |row|
+        expect(row).to be_an_instance_of(Array)
       end
     end
 
     it "should cache previously yielded results by default" do
-      @result.first.object_id.should eql(@result.first.object_id)
+      expect(@result.first.object_id).to eql(@result.first.object_id)
     end
 
     it "should not cache previously yielded results if cache_rows is disabled" do
-      result = @client.query "SELECT 1", :cache_rows => false
-      result.first.object_id.should_not eql(result.first.object_id)
+      result = @client.query "SELECT 1", cache_rows: false
+      expect(result.first.object_id).not_to eql(result.first.object_id)
+    end
+
+    it "should be able to iterate a second time even if cache_rows is disabled" do
+      result = @client.query "SELECT 1 UNION SELECT 2", cache_rows: false
+      expect(result.to_a).to eql(result.to_a)
+    end
+
+    it "should yield different value for #first if streaming" do
+      result = @client.query "SELECT 1 UNION SELECT 2", stream: true, cache_rows: false
+      expect(result.first).not_to eql(result.first)
+    end
+
+    it "should yield the same value for #first if streaming is disabled" do
+      result = @client.query "SELECT 1 UNION SELECT 2", stream: false
+      expect(result.first).to eql(result.first)
+    end
+
+    it "should throw an exception if we try to iterate twice when streaming is enabled" do
+      result = @client.query "SELECT 1 UNION SELECT 2", stream: true, cache_rows: false
+
+      expect do
+        result.each.to_a
+        result.each.to_a
+      end.to raise_exception(Mysql2::Error)
     end
   end
 
   context "#fields" do
-    before(:each) do
-      @client.query "USE test"
-      @test_result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1")
-    end
+    let(:test_result) { @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1") }
 
     it "method should exist" do
-      @test_result.should respond_to(:fields)
+      expect(test_result).to respond_to(:fields)
     end
 
     it "should return an array of field names in proper order" do
       result = @client.query "SELECT 'a', 'b', 'c'"
-      result.fields.should eql(['a', 'b', 'c'])
+      expect(result.fields).to eql(%w[a b c])
     end
   end
 
-  context "row data type mapping" do
-    before(:each) do
+  context "streaming" do
+    it "should maintain a count while streaming" do
+      result = @client.query('SELECT 1', stream: true, cache_rows: false)
+      expect(result.count).to eql(0)
+      result.each.to_a
+      expect(result.count).to eql(1)
+    end
+
+    it "should retain the count when mixing first and each" do
+      result = @client.query("SELECT 1 UNION SELECT 2", stream: true, cache_rows: false)
+      expect(result.count).to eql(0)
+      result.first
+      expect(result.count).to eql(1)
+      result.each.to_a
+      expect(result.count).to eql(2)
+    end
+
+    it "should not yield nil at the end of streaming" do
+      result = @client.query('SELECT * FROM mysql2_test', stream: true, cache_rows: false)
+      result.each { |r| expect(r).not_to be_nil }
+    end
+
+    it "#count should be zero for rows after streaming when there were no results" do
       @client.query "USE test"
-      @test_result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+      result = @client.query("SELECT * FROM mysql2_test WHERE null_test IS NOT NULL", stream: true, cache_rows: false)
+      expect(result.count).to eql(0)
+      result.each.to_a
+      expect(result.count).to eql(0)
+    end
+
+    it "should raise an exception if streaming ended due to a timeout" do
+      @client.query "CREATE TEMPORARY TABLE streamingTest (val BINARY(255)) ENGINE=MEMORY"
+
+      # Insert enough records to force the result set into multiple reads
+      # (the BINARY type is used simply because it forces full width results)
+      10000.times do |i|
+        @client.query "INSERT INTO streamingTest (val) VALUES ('Foo #{i}')"
+      end
+
+      @client.query "SET net_write_timeout = 1"
+      res = @client.query "SELECT * FROM streamingTest", stream: true, cache_rows: false
+
+      expect do
+        res.each_with_index do |_, i|
+          # Exhaust the first result packet then trigger a timeout
+          sleep 2 if i > 0 && i % 1000 == 0
+        end
+      end.to raise_error(Mysql2::Error, /Lost connection/)
+    end
+  end
+
+  context "row data type mapping" do
+    let(:test_result) { @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first }
+
+    it "should return nil values for NULL and strings for everything else when :cast is false" do
+      result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', cast: false).first
+      expect(result["null_test"]).to be_nil
+      expect(result["tiny_int_test"]).to eql("1")
+      expect(result["bool_cast_test"]).to eql("1")
+      expect(result["int_test"]).to eql("10")
+      expect(result["date_test"]).to eql("2010-04-04")
+      expect(result["enum_test"]).to eql("val1")
     end
 
     it "should return nil for a NULL value" do
-      @test_result['null_test'].class.should eql(NilClass)
-      @test_result['null_test'].should eql(nil)
+      expect(test_result['null_test']).to be_an_instance_of(NilClass)
+      expect(test_result['null_test']).to eql(nil)
     end
 
-    it "should return Fixnum for a BIT value" do
-      @test_result['bit_test'].class.should eql(String)
-      @test_result['bit_test'].should eql("\000\000\000\000\000\000\000\005")
+    it "should return String for a BIT(64) value" do
+      expect(test_result['bit_test']).to be_an_instance_of(String)
+      expect(test_result['bit_test']).to eql("\000\000\000\000\000\000\000\005")
+    end
+
+    it "should return String for a BIT(1) value" do
+      expect(test_result['single_bit_test']).to be_an_instance_of(String)
+      expect(test_result['single_bit_test']).to eql("\001")
     end
 
     it "should return Fixnum for a TINYINT value" do
-      [Fixnum, Bignum].should include(@test_result['tiny_int_test'].class)
-      @test_result['tiny_int_test'].should eql(1)
+      expect(num_classes).to include(test_result['tiny_int_test'].class)
+      expect(test_result['tiny_int_test']).to eql(1)
+    end
+
+    context "cast booleans for TINYINT if :cast_booleans is enabled" do
+      # rubocop:disable Style/Semicolon
+      let(:id1) { @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES ( 1)'; @client.last_id }
+      let(:id2) { @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES ( 0)'; @client.last_id }
+      let(:id3) { @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES (-1)'; @client.last_id }
+      # rubocop:enable Style/Semicolon
+
+      after do
+        @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+      end
+
+      it "should return TrueClass or FalseClass for a TINYINT value if :cast_booleans is enabled" do
+        result1 = @client.query "SELECT bool_cast_test FROM mysql2_test WHERE id = #{id1} LIMIT 1", cast_booleans: true
+        result2 = @client.query "SELECT bool_cast_test FROM mysql2_test WHERE id = #{id2} LIMIT 1", cast_booleans: true
+        result3 = @client.query "SELECT bool_cast_test FROM mysql2_test WHERE id = #{id3} LIMIT 1", cast_booleans: true
+        expect(result1.first['bool_cast_test']).to be true
+        expect(result2.first['bool_cast_test']).to be false
+        expect(result3.first['bool_cast_test']).to be true
+      end
     end
 
-    it "should return TrueClass or FalseClass for a TINYINT value if :cast_booleans is enabled" do
-      @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES (1)'
-      id1 = @client.last_id
-      @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES (0)'
-      id2 = @client.last_id
+    context "cast booleans for BIT(1) if :cast_booleans is enabled" do
+      # rubocop:disable Style/Semicolon
+      let(:id1) { @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (1)'; @client.last_id }
+      let(:id2) { @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (0)'; @client.last_id }
+      # rubocop:enable Style/Semicolon
 
-      result1 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast_booleans => true
-      result2 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = 0 LIMIT 1', :cast_booleans => true
-      result1.first['bool_cast_test'].should be_true
-      result2.first['bool_cast_test'].should be_false
+      after do
+        @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2})"
+      end
 
-      @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2})"
+      it "should return TrueClass or FalseClass for a BIT(1) value if :cast_booleans is enabled" do
+        result1 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id1}", cast_booleans: true
+        result2 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id2}", cast_booleans: true
+        expect(result1.first['single_bit_test']).to be true
+        expect(result2.first['single_bit_test']).to be false
+      end
     end
 
     it "should return Fixnum for a SMALLINT value" do
-      [Fixnum, Bignum].should include(@test_result['small_int_test'].class)
-      @test_result['small_int_test'].should eql(10)
+      expect(num_classes).to include(test_result['small_int_test'].class)
+      expect(test_result['small_int_test']).to eql(10)
     end
 
     it "should return Fixnum for a MEDIUMINT value" do
-      [Fixnum, Bignum].should include(@test_result['medium_int_test'].class)
-      @test_result['medium_int_test'].should eql(10)
+      expect(num_classes).to include(test_result['medium_int_test'].class)
+      expect(test_result['medium_int_test']).to eql(10)
     end
 
     it "should return Fixnum for an INT value" do
-      [Fixnum, Bignum].should include(@test_result['int_test'].class)
-      @test_result['int_test'].should eql(10)
+      expect(num_classes).to include(test_result['int_test'].class)
+      expect(test_result['int_test']).to eql(10)
     end
 
     it "should return Fixnum for a BIGINT value" do
-      [Fixnum, Bignum].should include(@test_result['big_int_test'].class)
-      @test_result['big_int_test'].should eql(10)
+      expect(num_classes).to include(test_result['big_int_test'].class)
+      expect(test_result['big_int_test']).to eql(10)
     end
 
     it "should return Fixnum for a YEAR value" do
-      [Fixnum, Bignum].should include(@test_result['year_test'].class)
-      @test_result['year_test'].should eql(2009)
+      expect(num_classes).to include(test_result['year_test'].class)
+      expect(test_result['year_test']).to eql(2009)
     end
 
     it "should return BigDecimal for a DECIMAL value" do
-      @test_result['decimal_test'].class.should eql(BigDecimal)
-      @test_result['decimal_test'].should eql(10.3)
+      expect(test_result['decimal_test']).to be_an_instance_of(BigDecimal)
+      expect(test_result['decimal_test']).to eql(10.3)
     end
 
     it "should return Float for a FLOAT value" do
-      @test_result['float_test'].class.should eql(Float)
-      @test_result['float_test'].should eql(10.3)
+      expect(test_result['float_test']).to be_an_instance_of(Float)
+      expect(test_result['float_test']).to eql(10.3)
     end
 
     it "should return Float for a DOUBLE value" do
-      @test_result['double_test'].class.should eql(Float)
-      @test_result['double_test'].should eql(10.3)
+      expect(test_result['double_test']).to be_an_instance_of(Float)
+      expect(test_result['double_test']).to eql(10.3)
     end
 
     it "should return Time for a DATETIME value when within the supported range" do
-      @test_result['date_time_test'].class.should eql(Time)
-      @test_result['date_time_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+      expect(test_result['date_time_test']).to be_an_instance_of(Time)
+      expect(test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
-    it "should return DateTime for a DATETIME value when outside the supported range, Time if otherwise" do
-      if RUBY_PLATFORM =~ /mswin/
-        inside_year = 1970
-        outside_year = inside_year-1
-      else
-        inside_year = 1902
-        outside_year = inside_year-1
-      end
-      r = @client.query("SELECT CAST('#{inside_year}-1-1 01:01:01' AS DATETIME) as test")
-      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
-        klass = DateTime
-      else
-        klass = Time
-      end
-      r.first['test'].class.should eql(klass)
+    it "should return Time when timestamp is < 1901-12-13 20:45:52" do
+      r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+      expect(r.first['test']).to be_an_instance_of(Time)
+    end
 
-      r = @client.query("SELECT CAST('#{outside_year}-1-1 01:01:01' AS DATETIME) as test")
-      r.first['test'].class.should eql(DateTime)
+    it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+      r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+      expect(r.first['test']).to be_an_instance_of(Time)
     end
 
     it "should return Time for a TIMESTAMP value when within the supported range" do
-      @test_result['timestamp_test'].class.should eql(Time)
-      @test_result['timestamp_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+      expect(test_result['timestamp_test']).to be_an_instance_of(Time)
+      expect(test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2010-04-04 11:44:00')
     end
 
     it "should return Time for a TIME value" do
-      @test_result['time_test'].class.should eql(Time)
-      @test_result['time_test'].strftime("%F %T").should eql('2000-01-01 11:44:00')
+      expect(test_result['time_test']).to be_an_instance_of(Time)
+      expect(test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S")).to eql('2000-01-01 11:44:00')
     end
 
     it "should return Date for a DATE value" do
-      @test_result['date_test'].class.should eql(Date)
-      @test_result['date_test'].strftime("%F").should eql('2010-04-04')
+      expect(test_result['date_test']).to be_an_instance_of(Date)
+      expect(test_result['date_test'].strftime("%Y-%m-%d")).to eql('2010-04-04')
     end
 
     it "should return String for an ENUM value" do
-      @test_result['enum_test'].class.should eql(String)
-      @test_result['enum_test'].should eql('val1')
+      expect(test_result['enum_test']).to be_an_instance_of(String)
+      expect(test_result['enum_test']).to eql('val1')
     end
 
-    if defined? Encoding
-      context "string encoding for ENUM values" do
-        it "should default to the connection's encoding if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
+    it "should raise an error given an invalid DATETIME" do
+      expect { @client.query("SELECT CAST('1972-00-27 00:00:00' AS DATETIME) as bad_datetime").each }.to \
+        raise_error(Mysql2::Error, "Invalid date in field 'bad_datetime': 1972-00-27 00:00:00")
+    end
+
+    context "string encoding for ENUM values" do
+      it "should default to the connection's encoding if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.find('utf-8'))
+          expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new :encoding => 'ascii'
-          client2.query "USE test"
+          client2 = new_client(encoding: 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.find('us-ascii'))
+          expect(result['enum_test'].encoding).to eql(Encoding::ASCII)
         end
+      end
 
-        it "should use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
+      it "should use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
+          expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
+        end
+
+        with_internal_encoding Encoding::ASCII do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.default_internal)
+          expect(result['enum_test'].encoding).to eql(Encoding.default_internal)
         end
       end
     end
 
     it "should return String for a SET value" do
-      @test_result['set_test'].class.should eql(String)
-      @test_result['set_test'].should eql('val1,val2')
+      expect(test_result['set_test']).to be_an_instance_of(String)
+      expect(test_result['set_test']).to eql('val1,val2')
     end
 
-    if defined? Encoding
-      context "string encoding for SET values" do
-        it "should default to the connection's encoding if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
+    context "string encoding for SET values" do
+      it "should default to the connection's encoding if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.find('utf-8'))
+          expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new :encoding => 'ascii'
-          client2.query "USE test"
+          client2 = new_client(encoding: 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.find('us-ascii'))
+          expect(result['set_test'].encoding).to eql(Encoding::ASCII)
         end
+      end
 
-        it "should use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
+      it "should use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
+          expect(result['set_test'].encoding).to eql(Encoding.default_internal)
+        end
+
+        with_internal_encoding Encoding::ASCII do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.default_internal)
+          expect(result['set_test'].encoding).to eql(Encoding.default_internal)
         end
       end
     end
 
     it "should return String for a BINARY value" do
-      @test_result['binary_test'].class.should eql(String)
-      @test_result['binary_test'].should eql("test#{"\000"*6}")
+      expect(test_result['binary_test']).to be_an_instance_of(String)
+      expect(test_result['binary_test']).to eql("test#{"\000" * 6}")
     end
 
-    if defined? Encoding
-      context "string encoding for BINARY values" do
-        it "should default to binary if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
+    context "string encoding for BINARY values" do
+      it "should default to binary if Encoding.default_internal is nil" do
+        with_internal_encoding nil do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['binary_test'].encoding.should eql(Encoding.find('binary'))
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
         end
+      end
 
-        it "should not use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
+      it "should not use Encoding.default_internal" do
+        with_internal_encoding Encoding::UTF_8 do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['binary_test'].encoding.should eql(Encoding.find('binary'))
-          Encoding.default_internal = Encoding.find('us-ascii')
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
+        end
+
+        with_internal_encoding Encoding::ASCII do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['binary_test'].encoding.should eql(Encoding.find('binary'))
+          expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
         end
       end
     end
@@ -281,53 +414,72 @@ describe Mysql2::Result do
       'medium_blob_test' => 'MEDIUMBLOB',
       'medium_text_test' => 'MEDIUMTEXT',
       'long_blob_test' => 'LONGBLOB',
-      'long_text_test' => 'LONGTEXT'
+      'long_text_test' => 'LONGTEXT',
     }.each do |field, type|
       it "should return a String for #{type}" do
-        @test_result[field].class.should eql(String)
-        @test_result[field].should eql("test")
+        expect(test_result[field]).to be_an_instance_of(String)
+        expect(test_result[field]).to eql("test")
       end
 
-      if defined? Encoding
-        context "string encoding for #{type} values" do
-          if ['VARBINARY', 'TINYBLOB', 'BLOB', 'MEDIUMBLOB', 'LONGBLOB'].include?(type)
-            it "should default to binary if Encoding.default_internal is nil" do
-              Encoding.default_internal = nil
+      context "string encoding for #{type} values" do
+        if %w[VARBINARY TINYBLOB BLOB MEDIUMBLOB LONGBLOB].include?(type)
+          it "should default to binary if Encoding.default_internal is nil" do
+            with_internal_encoding nil do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result['binary_test'].encoding.should eql(Encoding.find('binary'))
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
             end
+          end
 
-            it "should not use Encoding.default_internal" do
-              Encoding.default_internal = Encoding.find('utf-8')
+          it "should not use Encoding.default_internal" do
+            with_internal_encoding Encoding::UTF_8 do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result['binary_test'].encoding.should eql(Encoding.find('binary'))
-              Encoding.default_internal = Encoding.find('us-ascii')
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
+            end
+
+            with_internal_encoding Encoding::ASCII do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result['binary_test'].encoding.should eql(Encoding.find('binary'))
+              expect(result['binary_test'].encoding).to eql(Encoding::BINARY)
             end
-          else
-            it "should default to utf-8 if Encoding.default_internal is nil" do
-              Encoding.default_internal = nil
+          end
+        else
+          it "should default to utf-8 if Encoding.default_internal is nil" do
+            with_internal_encoding nil do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.find('utf-8'))
+              expect(result[field].encoding).to eql(Encoding::UTF_8)
 
-              client2 = Mysql2::Client.new :encoding => 'ascii'
-              client2.query "USE test"
+              client2 = new_client(encoding: 'ascii')
               result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.find('us-ascii'))
+              expect(result[field].encoding).to eql(Encoding::ASCII)
             end
+          end
 
-            it "should use Encoding.default_internal" do
-              Encoding.default_internal = Encoding.find('utf-8')
+          it "should use Encoding.default_internal" do
+            with_internal_encoding Encoding::UTF_8 do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.default_internal)
-              Encoding.default_internal = Encoding.find('us-ascii')
+              expect(result[field].encoding).to eql(Encoding.default_internal)
+            end
+
+            with_internal_encoding Encoding::ASCII do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.default_internal)
+              expect(result[field].encoding).to eql(Encoding.default_internal)
             end
           end
         end
       end
     end
   end
+
+  context "server flags" do
+    let(:test_result) { @client.query("SELECT * FROM mysql2_test ORDER BY null_test DESC LIMIT 1") }
+
+    it "should set a definitive value for query_was_slow" do
+      expect(test_result.server_flags[:query_was_slow]).to eql(false)
+    end
+    it "should set a definitive value for no_index_used" do
+      expect(test_result.server_flags[:no_index_used]).to eql(true)
+    end
+    it "should set a definitive value for no_good_index_used" do
+      expect(test_result.server_flags[:no_good_index_used]).to eql(false)
+    end
+  end
 end