mysql2 0.4.6-x86-mswin32-60 → 0.4.7-x86-mswin32-60

data/spec/mysql2/error_spec.rb

@@ -3,11 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Mysql2::Error do
-  let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
-
   let(:error) do
     begin
-      client.query("HAHAHA")
+      @client.query("HAHAHA")
     rescue Mysql2::Error => e
       error = e
     end
@@ -28,7 +26,7 @@ RSpec.describe Mysql2::Error do
     let(:valid_utf8) { '造字' }
     let(:error) do
       begin
-        client.query(valid_utf8)
+        @client.query(valid_utf8)
       rescue Mysql2::Error => e
         e
       end
@@ -37,7 +35,7 @@ RSpec.describe Mysql2::Error do
     let(:invalid_utf8) { ["e5c67d1f"].pack('H*').force_encoding(Encoding::UTF_8) }
     let(:bad_err) do
       begin
-        client.query(invalid_utf8)
+        @client.query(invalid_utf8)
       rescue Mysql2::Error => e
         e
       end

data/spec/mysql2/result_spec.rb

@@ -153,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|
@@ -367,10 +365,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
 
@@ -400,10 +397,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
 
@@ -494,10 +490,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,7 +3,7 @@ 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
@@ -326,18 +326,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
 
@@ -524,10 +525,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
 
@@ -557,10 +557,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
 
@@ -651,10 +650,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
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: x86-mswin32-60
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -91,11 +91,11 @@ post_install_message: |2+
   ======================================================================================================
 
     You've installed the binary version of mysql2.
-    It was built using MySQL Connector/C version 6.1.9.
+    It was built using MySQL Connector/C version 6.1.10.
     It's recommended to use the exact same version to avoid potential issues.
 
     At the time of building this gem, the necessary DLL files were retrieved from:
-    http://cdn.mysql.com/Downloads/Connector-C/mysql-connector-c-6.1.9-win32.zip
+    http://cdn.mysql.com/Downloads/Connector-C/mysql-connector-c-6.1.10-win32.zip
 
     This gem *includes* vendor/libmysql.dll with redistribution notice in vendor/README.