ruby-mysql 2.9.10 → 2.9.11

data/lib/mysql/packet.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 class Mysql
   class Packet
     # convert Numeric to LengthCodedBinary

data/lib/mysql/protocol.rb

@@ -1,3 +1,4 @@
+# coding: ascii-8bit
 # Copyright (C) 2008-2012 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
@@ -282,16 +283,16 @@ class Mysql
 
     # Retrieve all records for simple query
     # === Argument
-    # nfields :: [Integer] number of fields
+    # fields :: [Array<Mysql::Field>] number of fields
     # === Return
     # [Array of Array of String] all records
-    def retr_all_records(nfields)
+    def retr_all_records(fields)
       check_state :RESULT
       enc = charset.encoding
       begin
         all_recs = []
         until (pkt = read).eof?
-          all_recs.push RawRecord.new(pkt, nfields, enc)
+          all_recs.push RawRecord.new(pkt, fields, enc)
         end
         pkt.read(3)
         @server_status = pkt.utiny
@@ -501,7 +502,7 @@ class Mysql
           raise EOFError unless ret && ret.length == len
         end
       rescue EOFError
-        raise ClientError::ServerGoneError, 'The MySQL server has gone away'
+        raise ClientError::ServerGoneError, 'MySQL server has gone away'
       rescue Timeout::Error
         raise ClientError, "read timeout"
       end while len == MAX_PACKET_LENGTH
@@ -549,7 +550,7 @@ class Mysql
           @sock.flush
         end
       rescue Errno::EPIPE
-        raise ClientError::ServerGoneError, 'The MySQL server has gone away'
+        raise ClientError::ServerGoneError, 'MySQL server has gone away'
       rescue Timeout::Error
         raise ClientError, "write timeout"
       end
@@ -730,14 +731,16 @@ class Mysql
   end
 
   class RawRecord
-    def initialize(packet, nfields, encoding)
-      @packet, @nfields, @encoding = packet, nfields, encoding
+    def initialize(packet, fields, encoding)
+      @packet, @fields, @encoding = packet, fields, encoding
     end
 
     def to_a
-      @nfields.times.map do
+      @fields.map do |f|
         if s = @packet.lcs
-          s = Charset.convert_encoding(s, @encoding)
+          unless f.type == Field::TYPE_BIT or f.charsetnr == Charset::BINARY_CHARSET_NUMBER
+            s = Charset.convert_encoding(s, @encoding)
+          end
         end
         s
       end

data/spec/mysql_spec.rb

@@ -13,7 +13,7 @@ MYSQL_SOCKET   = ENV['MYSQL_SOCKET']
 
 describe 'Mysql::VERSION' do
   it 'returns client version' do
-    Mysql::VERSION.should == 20910
+    Mysql::VERSION.should == 20911
   end
 end
 
@@ -338,13 +338,14 @@ describe 'Mysql' do
   end
 
   describe '#kill' do
-    it 'returns self' do
-      @m.kill(@m.thread_id).should == @m
+    before do
+      @m2 = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
     end
-    it 'kill specified connection' do
-      m = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
-      m.list_processes.map(&:first).should be_include @m.thread_id.to_s
-      m.close
+    after do
+      @m2.close rescue nil
+    end
+    it 'returns self' do
+      @m.kill(@m2.thread_id).should == @m
     end
   end
 
@@ -1719,11 +1720,21 @@ if defined? Encoding
 
     describe 'default_internal is CP932' do
       before do
+        @m.prepare("insert into t (utf8,cp932,eucjp,bin) values (?,?,?,?)").execute @utf8, @cp932, @eucjp, @bin
         Encoding.default_internal = 'CP932'
       end
       it 'is converted to CP932' do
         @m.query('select "あいう"').fetch.should == ["\x82\xA0\x82\xA2\x82\xA4".force_encoding("CP932")]
       end
+      it 'data is stored as is' do
+        @m.query('select hex(utf8),hex(cp932),hex(eucjp),hex(bin) from t').fetch.should == ['E38184E3828DE381AF', '82A282EB82CD', 'A4A4A4EDA4CF', '00017F80FEFF']
+      end
+      it 'By simple query, charset of retrieved data is connection charset' do
+        @m.query('select utf8,cp932,eucjp,bin from t').fetch.should == [@cp932, @cp932, @cp932, @bin]
+      end
+      it 'By prepared statement, charset of retrieved data is connection charset except for binary' do
+        @m.prepare('select utf8,cp932,eucjp,bin from t').execute.fetch.should == [@cp932, @cp932, @cp932, @bin]
+      end
     end
 
     describe 'query with CP932 encoding' do
@@ -1746,7 +1757,7 @@ if defined? Encoding
         @m.query('select hex(utf8),hex(cp932),hex(eucjp),hex(bin) from t').fetch.should == ['E38184E3828DE381AF', '82A282EB82CD', 'A4A4A4EDA4CF', '00017F80FEFF']
       end
       it 'By simple query, charset of retrieved data is connection charset' do
-        @m.query('select utf8,cp932,eucjp,bin from t').fetch.should == [@utf8, @utf8, @utf8, @bin.dup.force_encoding("UTF-8")]
+        @m.query('select utf8,cp932,eucjp,bin from t').fetch.should == [@utf8, @utf8, @utf8, @bin]
       end
       it 'By prepared statement, charset of retrieved data is connection charset except for binary' do
         @m.prepare('select utf8,cp932,eucjp,bin from t').execute.fetch.should == [@utf8, @utf8, @utf8, @bin]
@@ -1761,7 +1772,7 @@ if defined? Encoding
         @m.query("select hex(utf8),hex(cp932),hex(eucjp),hex(bin) from t").fetch.should == ["E38184E3828DE381AF", "82A282EB82CD", "A4A4A4EDA4CF", "E38184E3828DE381AF"]
       end
       it 'By simple query, charset of retrieved data is connection charset' do
-        @m.query("select utf8,cp932,eucjp,bin from t").fetch.should == [@utf8, @utf8, @utf8, @utf8]
+        @m.query("select utf8,cp932,eucjp,bin from t").fetch.should == [@utf8, @utf8, @utf8, @utf8.dup.force_encoding('ASCII-8BIT')]
       end
       it 'By prepared statement, charset of retrieved data is connection charset except for binary' do
         @m.prepare("select utf8,cp932,eucjp,bin from t").execute.fetch.should == [@utf8, @utf8, @utf8, @utf8.dup.force_encoding("ASCII-8BIT")]

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 2.9.10
-  prerelease: 
+  version: 2.9.11
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -30,27 +29,26 @@ files:
 homepage: http://github.com/tmtm/ruby-mysql
 licenses:
 - Ruby's
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MySQL connector
 test_files:
 - spec/mysql_spec.rb