mysql2 0.2.19 → 0.2.20

data/lib/mysql2/client.rb

@@ -1,6 +1,6 @@
 module Mysql2
   class Client
-    attr_reader :query_options
+    attr_reader :query_options, :read_timeout
     @@default_query_options = {
       :as => :hash,                   # the type of object you want each row back as; also supports :array (an array of values)
       :async => false,                # don't wait for a result after sending the query, you'll have to monitor the socket yourself then eventually call Mysql2::Client#async_result
@@ -15,6 +15,7 @@ module Mysql2
 
     def initialize(opts = {})
       opts = Mysql2::Util.key_hash_as_symbols( opts )
+      @read_timeout = nil
       @query_options = @@default_query_options.dup
       @query_options.merge! opts
 

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.19"
+  VERSION = "0.2.20"
 end

data/spec/em/em_spec.rb

@@ -12,6 +12,7 @@ begin
         defer1 = client1.query "SELECT sleep(0.1) as first_query"
         defer1.callback do |result|
           results << result.first
+          client1.close
           EM.stop_event_loop
         end
 
@@ -19,6 +20,7 @@ begin
         defer2 = client2.query "SELECT sleep(0.025) second_query"
         defer2.callback do |result|
           results << result.first
+          client2.close
         end
       end
 
@@ -34,8 +36,9 @@ begin
         defer1.callback do |result|
           results << result.first
           defer2 = client.query "SELECT sleep(0.025) as second_query"
-          defer2.callback do |result|
-            results << result.first
+          defer2.callback do |r|
+            results << r.first
+            client.close
             EM.stop_event_loop
           end
         end
@@ -51,6 +54,7 @@ begin
           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|

data/spec/mysql2/client_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Mysql2::Client do
-  before(:each) do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
-  end
-
   it "should raise an exception upon connection failure" do
     lambda {
       # The odd local host IP address forces the mysql client library to
@@ -17,17 +13,17 @@ describe Mysql2::Client do
   if defined? Encoding
     it "should raise an exception on create for invalid encodings" do
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
       }.should raise_error(Mysql2::Error)
     end
 
     it "should not raise an exception on create for a valid encoding" do
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
       }.should_not raise_error(Mysql2::Error)
 
       lambda {
-        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
+        Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
       }.should_not raise_error(Mysql2::Error)
     end
   end
@@ -88,6 +84,8 @@ describe Mysql2::Client do
     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 respond to #close" do
@@ -111,20 +109,16 @@ describe Mysql2::Client do
 
   context "#warning_count" do
     context "when no warnings" do
-      before(:each) do
-        @client.query('select 1')
-      end
       it "should 0" do
+        @client.query('select 1')
         @client.warning_count.should == 0
       end
     end
     context "when has a warnings" do
-      before(:each) 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")
-      end
-      it "should > 0" do
         @client.warning_count.should > 0
       end
     end
@@ -136,32 +130,25 @@ describe Mysql2::Client do
 
   context "#query_info" do
     context "when no info present" do
-      before(:each) do
-        @client.query('select 1')
-      end
       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
-      before(:each) 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`))"
-      end
-
-      after(:each) do
-        @client.query "DROP TABLE infoTest"
-      end
 
-      before(:each) do
         # 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)")
-      end
-      it "should retrieve it" do
-        @client.query_info.should == {:records => 2, :duplicates => 0, :warnings => 0}
-        @client.query_info_string.should eq 'Records: 2  Duplicates: 0  Warnings: 0'
+
+        @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
@@ -186,7 +173,7 @@ describe Mysql2::Client do
 
   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 {}
+      @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)
@@ -277,30 +264,32 @@ describe Mysql2::Client do
         }.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
-      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
+      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
-          @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
 
@@ -419,12 +408,12 @@ describe Mysql2::Client do
       end
 
       it "returns multiple result sets" do
-        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should == { 'set_1' => 1 }
+        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'").first.should eql({ 'set_1' => 1 })
 
-        @multi_client.next_result.should == true
-        @multi_client.store_result.first.should == { 'set_2' => 2 }
+        @multi_client.next_result.should be_true
+        @multi_client.store_result.first.should eql({ 'set_2' => 2 })
 
-        @multi_client.next_result.should == false
+        @multi_client.next_result.should be_false
       end
 
       it "does not interfere with other statements" do
@@ -453,12 +442,12 @@ describe Mysql2::Client do
 
       it "#more_results? should work" do
         @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
-        @multi_client.more_results?.should == true
+        @multi_client.more_results?.should be_true
 
         @multi_client.next_result
         @multi_client.store_result
 
-        @multi_client.more_results?.should == false
+        @multi_client.more_results?.should be_false
       end
     end
   end
@@ -621,11 +610,11 @@ describe Mysql2::Client do
 
   it "should raise a Mysql2::Error exception upon connection failure" do
     lambda {
-      bad_client = Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
+      Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
     }.should raise_error(Mysql2::Error)
 
     lambda {
-      good_client = Mysql2::Client.new DatabaseCredentials['root']
+      Mysql2::Client.new DatabaseCredentials['root']
     }.should_not raise_error(Mysql2::Error)
   end
 

data/spec/mysql2/error_spec.rb

@@ -3,18 +3,22 @@ require 'spec_helper'
 
 describe Mysql2::Error do
   before(:each) do
-    @client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
     begin
-      @client.query("HAHAHA")
+      @err_client = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
+      @err_client.query("HAHAHA")
     rescue Mysql2::Error => e
       @error = e
+    ensure
+      @err_client.close
     end
 
-    @client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
     begin
-      @client2.query("HAHAHA")
+      @err_client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
+      @err_client2.query("HAHAHA")
     rescue Mysql2::Error => e
       @error2 = e
+    ensure
+      @err_client2.close
     end
   end
 
@@ -38,8 +42,8 @@ describe Mysql2::Error do
   unless RUBY_VERSION =~ /1.8/
     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)
+        @error.message.encoding.should eql(@err_client.encoding)
+        @error2.message.encoding.should eql(@err_client2.encoding)
       else
         @error.message.encoding.should eql(Encoding.default_internal)
         @error2.message.encoding.should eql(Encoding.default_internal)
@@ -48,8 +52,8 @@ describe Mysql2::Error do
 
     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)
+        @error.error.encoding.should eql(@err_client.encoding)
+        @error2.error.encoding.should eql(@err_client2.encoding)
       else
         @error.error.encoding.should eql(Encoding.default_internal)
         @error2.error.encoding.should eql(Encoding.default_internal)
@@ -58,8 +62,8 @@ describe Mysql2::Error do
 
     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)
+        @error.sql_state.encoding.should eql(@err_client.encoding)
+        @error2.sql_state.encoding.should eql(@err_client2.encoding)
       else
         @error.sql_state.encoding.should eql(Encoding.default_internal)
         @error2.sql_state.encoding.should eql(Encoding.default_internal)

data/spec/mysql2/result_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Mysql2::Result do
-  before(:each) do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
-  end
-
   before(:each) do
     @result = @client.query "SELECT 1"
   end
@@ -14,7 +10,7 @@ describe Mysql2::Result do
     result = @client.query('SELECT 1')
 
     result.count.should eql(1)
-    result.each { |r| }
+    result.each.to_a
     result.count.should eql(1)
   end
 
@@ -35,7 +31,7 @@ describe Mysql2::Result do
       @client.query "USE test"
       result = @client.query("SELECT * FROM mysql2_test WHERE null_test IS NOT NULL", :stream => true, :cache_rows => false)
       result.count.should eql(0)
-      result.each {|r|  }
+      result.each.to_a
       result.count.should eql(0)
   end
 
@@ -117,8 +113,8 @@ describe Mysql2::Result do
       result = @client.query "SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false
 
       expect {
-        result.each {}
-        result.each {}
+        result.each.to_a
+        result.each.to_a
       }.to raise_exception(Mysql2::Error)
     end
   end
@@ -148,11 +144,11 @@ describe Mysql2::Result do
     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
       result["null_test"].should be_nil
-      result["tiny_int_test"].should  == "1"
-      result["bool_cast_test"].should == "1"
-      result["int_test"].should       == "10"
-      result["date_test"].should      == "2010-04-04"
-      result["enum_test"].should      == "val1"
+      result["tiny_int_test"].should  eql("1")
+      result["bool_cast_test"].should eql("1")
+      result["int_test"].should       eql("10")
+      result["date_test"].should      eql("2010-04-04")
+      result["enum_test"].should      eql("val1")
     end
 
     it "should return nil for a NULL value" do
@@ -330,6 +326,7 @@ describe Mysql2::Result do
           client2.query "USE test"
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           result['enum_test'].encoding.should eql(Encoding.find('us-ascii'))
+          client2.close
         end
 
         it "should use Encoding.default_internal" do
@@ -359,6 +356,7 @@ describe Mysql2::Result do
           client2.query "USE test"
           result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
           result['set_test'].encoding.should eql(Encoding.find('us-ascii'))
+          client2.close
         end
 
         it "should use Encoding.default_internal" do
@@ -441,6 +439,7 @@ describe Mysql2::Result do
               client2.query "USE test"
               result = client2.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
               result[field].encoding.should eql(Encoding.find('us-ascii'))
+              client2.close
             end
 
             it "should use Encoding.default_internal" do

data/spec/spec_helper.rb

@@ -7,6 +7,14 @@ require 'yaml'
 DatabaseCredentials = YAML.load_file('spec/configuration.yml')
 
 RSpec.configure do |config|
+  config.before :each do
+    @client = Mysql2::Client.new DatabaseCredentials['root']
+  end
+
+  config.after :each do
+    @client.close
+  end
+
   config.before(:all) do
     client = Mysql2::Client.new DatabaseCredentials['root']
     client.query %[

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine