mysql2 0.3.11-x86-mingw32 → 0.3.18-x86-mingw32

data/spec/mysql2/error_spec.rb

@@ -1,68 +1,82 @@
 # encoding: UTF-8
+
 require 'spec_helper'
 
 describe Mysql2::Error do
-  before(:each) do
-    @client = Mysql2::Client.new :encoding => "utf8"
-    begin
-      @client.query("HAHAHA")
-    rescue Mysql2::Error => e
-      @error = e
-    end
+  let(:client) { Mysql2::Client.new(DatabaseCredentials['root']) }
 
-    @client2 = Mysql2::Client.new :encoding => "big5"
+  let :error do
     begin
-      @client2.query("HAHAHA")
+      client.query("HAHAHA")
     rescue Mysql2::Error => e
-      @error2 = e
+      error = e
+    ensure
+      client.close
     end
-  end
 
-  it "should respond to #error_number" do
-    @error.should respond_to(:error_number)
+    error
   end
 
-  it "should respond to #sql_state" do
-    @error.should respond_to(:sql_state)
-  end
+  it "responds to error_number and sql_state, with aliases" do
+    error.should respond_to(:error_number)
+    error.should respond_to(:sql_state)
 
-  # Mysql gem compatibility
-  it "should alias #error_number to #errno" do
-    @error.should respond_to(:errno)
+    # Mysql gem compatibility
+    error.should respond_to(:errno)
+    error.should respond_to(:error)
   end
 
-  it "should alias #message to #error" do
-    @error.should respond_to(:error)
-  end
+  if "".respond_to? :encoding
+    let :error do
+      client = Mysql2::Client.new(DatabaseCredentials['root'])
+      begin
+        client.query("\xE9\x80\xA0\xE5\xAD\x97")
+      rescue Mysql2::Error => e
+        error = e
+      ensure
+        client.close
+      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)
+      error
+    end
+
+    let :bad_err do
+      client = Mysql2::Client.new(DatabaseCredentials['root'])
+      begin
+        client.query("\xE5\xC6\x7D\x1F")
+      rescue Mysql2::Error => e
+        error = e
+      ensure
+        client.close
       end
+
+      error
     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)
+    it "returns error messages as UTF-8 by default" do
+      with_internal_encoding nil do
+        error.message.encoding.should eql(Encoding::UTF_8)
+        error.message.valid_encoding?
+
+        bad_err.message.encoding.should eql(Encoding::UTF_8)
+        bad_err.message.valid_encoding?
+
+        bad_err.message.should 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
+      error.sql_state.encoding.should eql(Encoding::US_ASCII)
+      error.sql_state.valid_encoding?
+    end
+
+    it "returns error messages and sql state in Encoding.default_internal if set" do
+      with_internal_encoding 'UTF-16LE' do
+        error.message.encoding.should eql(Encoding.default_internal)
+        error.message.valid_encoding?
+
+        bad_err.message.encoding.should eql(Encoding.default_internal)
+        bad_err.message.valid_encoding?
       end
     end
   end

data/spec/mysql2/result_spec.rb

@@ -2,10 +2,6 @@
 require 'spec_helper'
 
 describe Mysql2::Result do
-  before(:each) do
-    @client = Mysql2::Client.new :host => "localhost", :username => "root", :database => 'test'
-  end
-
   before(:each) do
     @result = @client.query "SELECT 1"
   end
@@ -73,11 +69,29 @@ describe Mysql2::Result do
       result = @client.query "SELECT 1", :cache_rows => false
       result.first.object_id.should_not eql(result.first.object_id)
     end
+
+    it "should yield different value for #first if streaming" do
+      result = @client.query "SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false
+      result.first.should_not 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
+      result.first.should 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 {
+        result.each.to_a
+        result.each.to_a
+      }.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
 
@@ -91,20 +105,70 @@ describe Mysql2::Result do
     end
   end
 
+  context "streaming" do
+    it "should maintain a count while streaming" do
+      result = @client.query('SELECT 1')
+
+      result.count.should eql(1)
+      result.each.to_a
+      result.count.should eql(1)
+    end
+
+    it "should set the actual count of rows after streaming" do
+      result = @client.query("SELECT * FROM mysql2_test", :stream => true, :cache_rows => false)
+      result.count.should eql(0)
+      result.each {|r|  }
+      result.count.should eql(1)
+    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| r.should_not be_nil}
+    end
+
+    it "#count should be zero for rows after streaming when there were no results" do
+      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.to_a
+      result.count.should eql(0)
+    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"
+
+      # 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
+
+      lambda {
+        res.each_with_index do |row, i|
+          # Exhaust the first result packet then trigger a timeout
+          sleep 2 if i > 0 && i % 1000 == 0
+        end
+      }.should raise_error(Mysql2::Error, /Lost connection/)
+    end
+  end
+
   context "row data type mapping" do
     before(:each) do
-      @client.query "USE test"
       @test_result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
     end
 
     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
@@ -112,11 +176,16 @@ describe Mysql2::Result do
       @test_result['null_test'].should eql(nil)
     end
 
-    it "should return Fixnum for a BIT value" do
+    it "should return String for a BIT(64) value" do
       @test_result['bit_test'].class.should eql(String)
       @test_result['bit_test'].should eql("\000\000\000\000\000\000\000\005")
     end
 
+    it "should return String for a BIT(1) value" do
+      @test_result['single_bit_test'].class.should eql(String)
+      @test_result['single_bit_test'].should 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)
@@ -127,11 +196,29 @@ describe Mysql2::Result do
       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
 
       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
       result1.first['bool_cast_test'].should be_true
       result2.first['bool_cast_test'].should be_false
+      result3.first['bool_cast_test'].should be_true
+
+      @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
+    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
+
+      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
+      result1.first['single_bit_test'].should be_true
+      result2.first['single_bit_test'].should be_false
 
       @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2})"
     end
@@ -182,7 +269,7 @@ describe Mysql2::Result do
     end
 
     if 1.size == 4 # 32bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         klass = Time
       else
         klass = DateTime
@@ -200,7 +287,7 @@ describe Mysql2::Result do
         r.first['test'].class.should eql(klass)
       end
     elsif 1.size == 8 # 64bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         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.first['test'].class.should eql(Time)
@@ -248,26 +335,40 @@ describe Mysql2::Result do
       @test_result['enum_test'].should eql('val1')
     end
 
+    it "should raise an error given an invalid DATETIME" do
+      begin
+        @client.query("SELECT CAST('1972-00-27 00:00:00' AS DATETIME) as bad_datetime").each
+      rescue Mysql2::Error => e
+        error = e
+      end
+
+      error.message.should eql("Invalid date in field 'bad_datetime': 1972-00-27 00:00:00")
+    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
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.find('utf-8'))
-
-          client2 = Mysql2::Client.new :encoding => 'ascii'
-          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'))
+          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'))
+
+            client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(: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'))
+            client2.close
+          end
         end
 
         it "should use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
-          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')
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['enum_test'].encoding.should eql(Encoding.default_internal)
+          with_internal_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)
+          end
+
+          with_internal_encoding 'us-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)
+          end
         end
       end
     end
@@ -280,23 +381,27 @@ describe Mysql2::Result do
     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
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.find('utf-8'))
-
-          client2 = Mysql2::Client.new :encoding => 'ascii'
-          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'))
+          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'))
+
+            client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(: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'))
+            client2.close
+          end
         end
 
         it "should use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
-          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')
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['set_test'].encoding.should eql(Encoding.default_internal)
+          with_internal_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)
+          end
+
+          with_internal_encoding 'us-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)
+          end
         end
       end
     end
@@ -309,18 +414,22 @@ describe Mysql2::Result do
     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
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['binary_test'].encoding.should eql(Encoding.find('binary'))
+          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'))
+          end
         end
 
         it "should not use Encoding.default_internal" do
-          Encoding.default_internal = Encoding.find('utf-8')
-          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')
-          result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-          result['binary_test'].encoding.should eql(Encoding.find('binary'))
+          with_internal_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'))
+          end
+
+          with_internal_encoding 'us-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'))
+          end
         end
       end
     end
@@ -347,38 +456,46 @@ describe Mysql2::Result do
         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
-              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result['binary_test'].encoding.should eql(Encoding.find('binary'))
+              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'))
+              end
             end
 
             it "should not use Encoding.default_internal" do
-              Encoding.default_internal = Encoding.find('utf-8')
-              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')
-              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result['binary_test'].encoding.should eql(Encoding.find('binary'))
+              with_internal_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'))
+              end
+
+              with_internal_encoding 'us-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'))
+              end
             end
           else
             it "should default to utf-8 if Encoding.default_internal is nil" do
-              Encoding.default_internal = nil
-              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.find('utf-8'))
-
-              client2 = Mysql2::Client.new :encoding => 'ascii'
-              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'))
+              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'))
+
+                client2 = Mysql2::Client.new(DatabaseCredentials['root'].merge(: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'))
+                client2.close
+              end
             end
 
             it "should use Encoding.default_internal" do
-              Encoding.default_internal = Encoding.find('utf-8')
-              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')
-              result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
-              result[field].encoding.should eql(Encoding.default_internal)
+              with_internal_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)
+              end
+
+              with_internal_encoding 'us-ascii' do
+                result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
+                result[field].encoding.should eql(Encoding.default_internal)
+              end
             end
           end
         end