mysql2 0.4.2 → 0.4.10

data/spec/mysql2/result_spec.rb

@@ -22,6 +22,10 @@ RSpec.describe Mysql2::Result do
     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
     expect {
       @client.query "bad sql"
@@ -78,6 +82,11 @@ RSpec.describe Mysql2::Result do
       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)
@@ -144,18 +153,16 @@ RSpec.describe Mysql2::Result do
     end
 
     it "should raise an exception if streaming ended due to a timeout" do
-      # Create an extra client instance, since we're going to time it out
-      client = Mysql2::Client.new DatabaseCredentials['root']
-      client.query "CREATE TEMPORARY TABLE streamingTest (val BINARY(255)) ENGINE=MEMORY"
+      @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}')"
+        @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
+      @client.query "SET net_write_timeout = 1"
+      res = @client.query "SELECT * FROM streamingTest", :stream => true, :cache_rows => false
 
       expect {
         res.each_with_index do |_, i|
@@ -201,36 +208,43 @@ RSpec.describe Mysql2::Result do
       expect(@test_result['tiny_int_test']).to eql(1)
     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
-      @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES (-1)'
-      id3 = @client.last_id
+    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
 
-      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
-      result3 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = -1 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
+      after do
+        @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+      end
 
-      @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+      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 BIT(1) value if :cast_booleans is enabled" do
-      @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (1)'
-      id1 = @client.last_id
-      @client.query 'INSERT INTO mysql2_test (single_bit_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 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
+      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
@@ -278,6 +292,30 @@ RSpec.describe Mysql2::Result do
       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 Time values with microseconds" do
+      now = Time.now
+      if RUBY_VERSION =~ /1.8/ || @client.server_info[:id] / 100 < 506
+        result = @client.query("SELECT CAST('#{now.strftime('%F %T %z')}' AS DATETIME) AS a")
+        expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
+      else
+        result = @client.query("SELECT CAST('#{now.strftime('%F %T.%6N %z')}' AS DATETIME(6)) AS a")
+        # microseconds is 6 digits after the decimal, but only test on 5 significant figures
+        expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
+      end
+    end
+
+    it "should return DateTime values with microseconds" do
+      now = DateTime.now
+      if RUBY_VERSION =~ /1.8/ || @client.server_info[:id] / 100 < 506
+        result = @client.query("SELECT CAST('#{now.strftime('%F %T %z')}' AS DATETIME)  AS a")
+        expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
+      else
+        result = @client.query("SELECT CAST('#{now.strftime('%F %T.%6N %z')}' AS DATETIME(6)) AS a")
+        # microseconds is 6 digits after the decimal, but only test on 5 significant figures
+        expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
+      end
+    end
+
     if 1.size == 4 # 32bit
       klass = if RUBY_VERSION =~ /1.8/
         DateTime
@@ -358,10 +396,9 @@ RSpec.describe Mysql2::Result do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          client2 = new_client(:encoding => 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['enum_test'].encoding).to eql(Encoding::ASCII)
-          client2.close
         end
       end
 
@@ -391,10 +428,9 @@ RSpec.describe Mysql2::Result do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          client2 = new_client(:encoding => 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['set_test'].encoding).to eql(Encoding::ASCII)
-          client2.close
         end
       end
 
@@ -485,10 +521,9 @@ RSpec.describe Mysql2::Result do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               expect(result[field].encoding).to eql(Encoding::UTF_8)
 
-              client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+              client2 = new_client(:encoding => 'ascii')
               result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               expect(result[field].encoding).to eql(Encoding::ASCII)
-              client2.close
             end
           end
 

data/spec/mysql2/statement_spec.rb

@@ -3,14 +3,16 @@ require './spec/spec_helper.rb'
 
 RSpec.describe Mysql2::Statement do
   before :each do
-    @client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+    @client = new_client(:encoding => "utf8")
+  end
+
+  def stmt_count
+    @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
   end
 
   it "should create a statement" do
     statement = nil
-    expect { statement = @client.prepare 'SELECT 1' }.to change {
-      @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
-    }.by(1)
+    expect { statement = @client.prepare 'SELECT 1' }.to change(&method(:stmt_count)).by(1)
     expect(statement).to be_an_instance_of(Mysql2::Statement)
   end
 
@@ -59,6 +61,32 @@ RSpec.describe Mysql2::Statement do
     expect(rows).to eq([{ "1" => 1 }])
   end
 
+  it "should handle booleans" do
+    stmt = @client.prepare('SELECT ? AS `true`, ? AS `false`')
+    result = stmt.execute(true, false)
+    expect(result.to_a).to eq(['true' => 1, 'false' => 0])
+  end
+
+  it "should handle bignum but in int64_t" do
+    stmt = @client.prepare('SELECT ? AS max, ? AS min')
+    int64_max = (1 << 63) - 1
+    int64_min = -(1 << 63)
+    result = stmt.execute(int64_max, int64_min)
+    expect(result.to_a).to eq(['max' => int64_max, 'min' => int64_min])
+  end
+
+  it "should handle bignum but beyond int64_t" do
+    stmt = @client.prepare('SELECT ? AS max1, ? AS max2, ? AS max3, ? AS min1, ? AS min2, ? AS min3')
+    int64_max1 = (1 << 63)
+    int64_max2 = (1 << 64) - 1
+    int64_max3 = 1 << 64
+    int64_min1 = -(1 << 63) - 1
+    int64_min2 = -(1 << 64) + 1
+    int64_min3 = -0xC000000000000000
+    result = stmt.execute(int64_max1, int64_max2, int64_max3, int64_min1, int64_min2, int64_min3)
+    expect(result.to_a).to eq(['max1' => int64_max1, 'max2' => int64_max2, 'max3' => int64_max3, 'min1' => int64_min1, 'min2' => int64_min2, 'min3' => int64_min3])
+  end
+
   it "should keep its result after other query" do
     @client.query 'USE test'
     @client.query 'CREATE TABLE IF NOT EXISTS mysql2_stmt_q(a int)'
@@ -108,6 +136,37 @@ RSpec.describe Mysql2::Statement do
     expect(result.first.first[1]).to be_an_instance_of(Time)
   end
 
+  it "should prepare Date values" do
+    now = Date.today
+    statement = @client.prepare('SELECT ? AS a')
+    result = statement.execute(now)
+    expect(result.first['a'].to_s).to eql(now.strftime('%F'))
+  end
+
+  it "should prepare Time values with microseconds" do
+    now = Time.now
+    statement = @client.prepare('SELECT ? AS a')
+    result = statement.execute(now)
+    if RUBY_VERSION =~ /1.8/
+      expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
+    else
+      # microseconds is six digits after the decimal, but only test on 5 significant figures
+      expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
+    end
+  end
+
+  it "should prepare DateTime values with microseconds" do
+    now = DateTime.now
+    statement = @client.prepare('SELECT ? AS a')
+    result = statement.execute(now)
+    if RUBY_VERSION =~ /1.8/
+      expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
+    else
+      # microseconds is six digits after the decimal, but only test on 5 significant figures
+      expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
+    end
+  end
+
   it "should tell us about the fields" do
     statement = @client.prepare 'SELECT 1 as foo, 2'
     statement.execute
@@ -117,6 +176,32 @@ RSpec.describe Mysql2::Statement do
     expect(list[1]).to eq('2')
   end
 
+  it "should handle as a decimal binding a BigDecimal" do
+    stmt = @client.prepare('SELECT ? AS decimal_test')
+    test_result = stmt.execute(BigDecimal.new("123.45")).first
+    expect(test_result['decimal_test']).to be_an_instance_of(BigDecimal)
+    expect(test_result['decimal_test']).to eql(123.45)
+  end
+
+  it "should update a DECIMAL value passing a BigDecimal" do
+    @client.query 'USE test'
+    @client.query 'DROP TABLE IF EXISTS mysql2_stmt_decimal_test'
+    @client.query 'CREATE TABLE mysql2_stmt_decimal_test (decimal_test DECIMAL(10,3))'
+
+    @client.prepare("INSERT INTO mysql2_stmt_decimal_test VALUES (?)").execute(BigDecimal.new("123.45"))
+
+    test_result = @client.query("SELECT * FROM mysql2_stmt_decimal_test").first
+    expect(test_result['decimal_test']).to eql(123.45)
+  end
+
+  it "should warn but still work if cache_rows is set to false" do
+    @client.query_options.merge!(:cache_rows => false)
+    statement = @client.prepare 'SELECT 1'
+    result = nil
+    expect { result = statement.execute.to_a }.to output(/:cache_rows is forced for prepared statements/).to_stderr
+    expect(result.length).to eq(1)
+  end
+
   context "utf8_db" do
     before(:each) do
       @client.query("DROP DATABASE IF EXISTS test_mysql2_stmt_utf8")
@@ -249,18 +334,19 @@ RSpec.describe Mysql2::Statement do
   end
 
   context "#fields" do
-    before(:each) do
-      @client.query "USE test"
-      @test_result = @client.prepare("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").execute
-    end
-
     it "method should exist" do
-      expect(@test_result).to respond_to(:fields)
+      stmt = @client.prepare("SELECT 1")
+      expect(stmt).to respond_to(:fields)
     end
 
     it "should return an array of field names in proper order" do
-      result = @client.prepare("SELECT 'a', 'b', 'c'").execute
-      expect(result.fields).to eql(%w(a b c))
+      stmt = @client.prepare("SELECT 'a', 'b', 'c'")
+      expect(stmt.fields).to eql(%w(a b c))
+    end
+
+    it "should return nil for statement with no result fields" do
+      stmt = @client.prepare("INSERT INTO mysql2_test () VALUES ()")
+      expect(stmt.fields).to eql(nil)
     end
   end
 
@@ -290,36 +376,47 @@ RSpec.describe Mysql2::Statement do
       expect(@test_result['tiny_int_test']).to eql(1)
     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
-      @client.query 'INSERT INTO mysql2_test (bool_cast_test) VALUES (-1)'
-      id3 = @client.last_id
+    context "cast booleans for TINYINT if :cast_booleans is enabled" do
+      # rubocop:disable Style/Semicolon
+      let(:client) { new_client(:cast_booleans => true) }
+      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
 
-      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
-      result3 = @client.query 'SELECT bool_cast_test FROM mysql2_test WHERE bool_cast_test = -1 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
+      after do
+        client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+      end
 
-      @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+      it "should return TrueClass or FalseClass for a TINYINT value if :cast_booleans is enabled" do
+        query = client.prepare 'SELECT bool_cast_test FROM mysql2_test WHERE id = ?'
+        result1 = query.execute id1
+        result2 = query.execute id2
+        result3 = query.execute id3
+        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 BIT(1) value if :cast_booleans is enabled" do
-      @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (1)'
-      id1 = @client.last_id
-      @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (0)'
-      id2 = @client.last_id
+    context "cast booleans for BIT(1) if :cast_booleans is enabled" do
+      # rubocop:disable Style/Semicolon
+      let(:client) { new_client(:cast_booleans => true) }
+      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 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
+      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
+        query = client.prepare 'SELECT single_bit_test FROM mysql2_test WHERE id = ?'
+        result1 = query.execute id1
+        result2 = query.execute id2
+        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
@@ -376,39 +473,39 @@ RSpec.describe Mysql2::Statement do
 
       it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
         # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
-        r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+        r = @client.prepare("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test").execute
         expect(r.first['test']).to be_an_instance_of(klass)
       end
 
       it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
         # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
-        r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+        r = @client.prepare("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test").execute
         expect(r.first['test']).to be_an_instance_of(klass)
       end
     elsif 1.size == 8 # 64bit
       if RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is > 0138-12-31 11:59:59" do
-          r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
+          r = @client.prepare("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test").execute
           expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
-          r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
+          r = @client.prepare("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test").execute
           expect(r.first['test']).to be_an_instance_of(DateTime)
         end
 
         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")
+          r = @client.prepare("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test").execute
           expect(r.first['test']).to be_an_instance_of(Time)
         end
       else
         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")
+          r = @client.prepare("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test").execute
           expect(r.first['test']).to be_an_instance_of(Time)
         end
 
         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")
+          r = @client.prepare("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test").execute
           expect(r.first['test']).to be_an_instance_of(Time)
         end
       end
@@ -447,10 +544,9 @@ RSpec.describe Mysql2::Statement do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['enum_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          client2 = new_client(:encoding => 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['enum_test'].encoding).to eql(Encoding::US_ASCII)
-          client2.close
         end
       end
 
@@ -480,10 +576,9 @@ RSpec.describe Mysql2::Statement do
           result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['set_test'].encoding).to eql(Encoding::UTF_8)
 
-          client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+          client2 = new_client(:encoding => 'ascii')
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           expect(result['set_test'].encoding).to eql(Encoding::US_ASCII)
-          client2.close
         end
       end
 
@@ -574,10 +669,9 @@ RSpec.describe Mysql2::Statement do
               result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               expect(result[field].encoding).to eql(Encoding::UTF_8)
 
-              client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => 'ascii'))
+              client2 = new_client(:encoding => 'ascii')
               result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               expect(result[field].encoding).to eql(Encoding::US_ASCII)
-              client2.close
             end
           end
 
@@ -670,9 +764,7 @@ RSpec.describe Mysql2::Statement do
   context 'close' do
     it 'should free server resources' do
       stmt = @client.prepare 'SELECT 1'
-      expect { stmt.close }.to change {
-        @client.query("SHOW STATUS LIKE 'Prepared_stmt_count'").first['Value'].to_i
-      }.by(-1)
+      expect { stmt.close }.to change(&method(:stmt_count)).by(-1)
     end
 
     it 'should raise an error on subsequent execution' do

data/spec/spec_helper.rb

@@ -23,72 +23,86 @@ RSpec.configure do |config|
     $VERBOSE = old_verbose
   end
 
+  def new_client(option_overrides = {})
+    client = Mysql2::Client.new(DatabaseCredentials['root'].merge(option_overrides))
+    @clients ||= []
+    @clients << client
+    return client unless block_given?
+    begin
+      yield client
+    ensure
+      client.close
+      @clients.delete(client)
+    end
+  end
+
   config.before :each do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
+    @client = new_client
   end
 
   config.after :each do
-    @client.close
+    @clients.each(&:close)
   end
 
   config.before(:all) do
-    client = Mysql2::Client.new DatabaseCredentials['root']
-    client.query %[
-      CREATE TABLE IF NOT EXISTS mysql2_test (
-        id MEDIUMINT NOT NULL AUTO_INCREMENT,
-        null_test VARCHAR(10),
-        bit_test BIT(64),
-        single_bit_test BIT(1),
-        tiny_int_test TINYINT,
-        bool_cast_test TINYINT(1),
-        small_int_test SMALLINT,
-        medium_int_test MEDIUMINT,
-        int_test INT,
-        big_int_test BIGINT,
-        float_test FLOAT(10,3),
-        float_zero_test FLOAT(10,3),
-        double_test DOUBLE(10,3),
-        decimal_test DECIMAL(10,3),
-        decimal_zero_test DECIMAL(10,3),
-        date_test DATE,
-        date_time_test DATETIME,
-        timestamp_test TIMESTAMP,
-        time_test TIME,
-        year_test YEAR(4),
-        char_test CHAR(10),
-        varchar_test VARCHAR(10),
-        binary_test BINARY(10),
-        varbinary_test VARBINARY(10),
-        tiny_blob_test TINYBLOB,
-        tiny_text_test TINYTEXT,
-        blob_test BLOB,
-        text_test TEXT,
-        medium_blob_test MEDIUMBLOB,
-        medium_text_test MEDIUMTEXT,
-        long_blob_test LONGBLOB,
-        long_text_test LONGTEXT,
-        enum_test ENUM('val1', 'val2'),
-        set_test SET('val1', 'val2'),
-        PRIMARY KEY (id)
-      )
-    ]
-    client.query "DELETE FROM mysql2_test;"
-    client.query %[
-      INSERT INTO mysql2_test (
-        null_test, bit_test, single_bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
-        float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
-        year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
-        tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
-        long_blob_test, long_text_test, enum_test, set_test
-      )
+    new_client do |client|
+      client.query %[
+        CREATE TABLE IF NOT EXISTS mysql2_test (
+          id MEDIUMINT NOT NULL AUTO_INCREMENT,
+          null_test VARCHAR(10),
+          bit_test BIT(64),
+          single_bit_test BIT(1),
+          tiny_int_test TINYINT,
+          bool_cast_test TINYINT(1),
+          small_int_test SMALLINT,
+          medium_int_test MEDIUMINT,
+          int_test INT,
+          big_int_test BIGINT,
+          float_test FLOAT(10,3),
+          float_zero_test FLOAT(10,3),
+          double_test DOUBLE(10,3),
+          decimal_test DECIMAL(10,3),
+          decimal_zero_test DECIMAL(10,3),
+          date_test DATE,
+          date_time_test DATETIME,
+          timestamp_test TIMESTAMP,
+          time_test TIME,
+          year_test YEAR(4),
+          char_test CHAR(10),
+          varchar_test VARCHAR(10),
+          binary_test BINARY(10),
+          varbinary_test VARBINARY(10),
+          tiny_blob_test TINYBLOB,
+          tiny_text_test TINYTEXT,
+          blob_test BLOB,
+          text_test TEXT,
+          medium_blob_test MEDIUMBLOB,
+          medium_text_test MEDIUMTEXT,
+          long_blob_test LONGBLOB,
+          long_text_test LONGTEXT,
+          enum_test ENUM('val1', 'val2'),
+          set_test SET('val1', 'val2'),
+          PRIMARY KEY (id)
+        )
+      ]
+      client.query "DELETE FROM mysql2_test;"
+      client.query %[
+        INSERT INTO mysql2_test (
+          null_test, bit_test, single_bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
+          float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
+          year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
+          tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
+          long_blob_test, long_text_test, enum_test, set_test
+        )
 
-      VALUES (
-        NULL, b'101', b'1', 1, 1, 10, 10, 10, 10,
-        10.3, 0, 10.3, 10.3, 0, '2010-4-4', '2010-4-4 11:44:00', '2010-4-4 11:44:00', '11:44:00',
-        2009, "test", "test", "test", "test", "test",
-        "test", "test", "test", "test", "test",
-        "test", "test", 'val1', 'val1,val2'
-      )
-    ]
+        VALUES (
+          NULL, b'101', b'1', 1, 1, 10, 10, 10, 10,
+          10.3, 0, 10.3, 10.3, 0, '2010-4-4', '2010-4-4 11:44:00', '2010-4-4 11:44:00', '11:44:00',
+          2009, "test", "test", "test", "test", "test",
+          "test", "test", "test", "test", "test",
+          "test", "test", 'val1', 'val1,val2'
+        )
+      ]
+    end
   end
 end

data/spec/ssl/gen_certs.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eu
+set -eux
 
 echo "
 [ ca ]