ruby-mysql 2.9.11 → 2.9.12

data/lib/mysql.rb

@@ -21,7 +21,7 @@ class Mysql
   rescue LoadError
   end
 
-  VERSION            = 20911               # Version number of this library
+  VERSION            = 20912               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -109,7 +109,7 @@ class Mysql
   # @return self
   def connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, socket=nil, flag=0)
     if flag & CLIENT_COMPRESS != 0
-      warn 'unsupported flag: CLIENT_COMPRESS'
+      warn 'unsupported flag: CLIENT_COMPRESS' if $VERBOSE
       flag &= ~CLIENT_COMPRESS
     end
     @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout
@@ -179,7 +179,7 @@ class Mysql
       @charset = Charset.by_name value.to_s
 #    when Mysql::SHARED_MEMORY_BASE_NAME
     else
-      warn "option not implemented: #{opt}"
+      warn "option not implemented: #{opt}" if $VERBOSE
     end
     self
   end

data/lib/mysql/protocol.rb

@@ -33,11 +33,11 @@ class Mysql
         return unsigned ? v : v < 32768 ? v : v-65536
       when Field::TYPE_INT24, Field::TYPE_LONG
         v = pkt.ulong
-        return unsigned ? v : v < 2**32/2 ? v : v-2**32
+        return unsigned ? v : v < 0x8000_0000 ? v : v-0x10000_0000
       when Field::TYPE_LONGLONG
         n1, n2 = pkt.ulong, pkt.ulong
         v = (n2 << 32) | n1
-        return unsigned ? v : v < 2**64/2 ? v : v-2**64
+        return unsigned ? v : v < 0x8000_0000_0000_0000 ? v : v-0x10000_0000_0000_0000
       when Field::TYPE_FLOAT
         return pkt.read(4).unpack('e').first
       when Field::TYPE_DOUBLE
@@ -79,38 +79,17 @@ class Mysql
         type = Field::TYPE_NULL
         val = ""
       when Integer
-        if v >= 0
-          if v < 256
-            type = Field::TYPE_TINY | 0x8000
-            val = [v].pack("C")
-          elsif v < 256**2
-            type = Field::TYPE_SHORT | 0x8000
-            val = [v].pack("v")
-          elsif v < 256**4
-            type = Field::TYPE_LONG | 0x8000
-            val = [v].pack("V")
-          elsif v < 256**8
-            type = Field::TYPE_LONGLONG | 0x8000
-            val = [v&0xffffffff, v>>32].pack("VV")
-          else
-            raise ProtocolError, "value too large: #{v}"
-          end
+        if -0x8000_0000 <= v && v < 0x8000_0000
+          type = Field::TYPE_LONG
+          val = [v].pack('V')
+        elsif -0x8000_0000_0000_0000 <= v && v < 0x8000_0000_0000_0000
+          type = Field::TYPE_LONGLONG
+          val = [v&0xffffffff, v>>32].pack("VV")
+        elsif 0x8000_0000_0000_0000 <= v && v <= 0xffff_ffff_ffff_ffff
+          type = Field::TYPE_LONGLONG | 0x8000
+          val = [v&0xffffffff, v>>32].pack("VV")
         else
-          if -v <= 256/2
-            type = Field::TYPE_TINY
-            val = [v].pack("C")
-          elsif -v <= 256**2/2
-            type = Field::TYPE_SHORT
-            val = [v].pack("v")
-          elsif -v <= 256**4/2
-            type = Field::TYPE_LONG
-            val = [v].pack("V")
-          elsif -v <= 256**8/2
-            type = Field::TYPE_LONGLONG
-            val = [v&0xffffffff, v>>32].pack("VV")
-          else
-            raise ProtocolError, "value too large: #{v}"
-          end
+          raise ProtocolError, "value too large: #{v}"
         end
       when Float
         type = Field::TYPE_DOUBLE
@@ -118,9 +97,12 @@ class Mysql
       when String
         type = Field::TYPE_STRING
         val = Packet.lcs(v)
-      when Mysql::Time, ::Time
+      when ::Time
+        type = Field::TYPE_DATETIME
+        val = [11, v.year, v.month, v.day, v.hour, v.min, v.sec, v.usec].pack("CvCCCCCV")
+      when Mysql::Time
         type = Field::TYPE_DATETIME
-        val = [7, v.year, v.month, v.day, v.hour, v.min, v.sec].pack("CvCCCCC")
+        val = [11, v.year, v.month, v.day, v.hour, v.min, v.sec, v.second_part].pack("CvCCCCCV")
       else
         raise ProtocolError, "class #{v.class} is not supported"
       end
@@ -488,7 +470,7 @@ class Mysql
     # === Exception
     # [ProtocolError] invalid packet sequence number
     def read
-      ret = ""
+      data = ''
       len = nil
       begin
         Timeout.timeout @read_timeout do
@@ -500,6 +482,7 @@ class Mysql
           @seq = (@seq + 1) % 256
           ret = @sock.read(len)
           raise EOFError unless ret && ret.length == len
+          data.concat ret
         end
       rescue EOFError
         raise ClientError::ServerGoneError, 'MySQL server has gone away'
@@ -510,18 +493,19 @@ class Mysql
       @sqlstate = "00000"
 
       # Error packet
-      if ret[0] == ?\xff
-        f, errno, marker, @sqlstate, message = ret.unpack("Cvaa5a*")
+      if data[0] == ?\xff
+        f, errno, marker, @sqlstate, message = data.unpack("Cvaa5a*")
         unless marker == "#"
-          f, errno, message = ret.unpack("Cva*")    # Version 4.0 Error
+          f, errno, message = data.unpack("Cva*")    # Version 4.0 Error
           @sqlstate = ""
         end
+        message.force_encoding(@charset.encoding)
         if Mysql::ServerError::ERROR_MAP.key? errno
           raise Mysql::ServerError::ERROR_MAP[errno].new(message, @sqlstate)
         end
         raise Mysql::ServerError.new(message, @sqlstate)
       end
-      Packet.new(ret)
+      Packet.new(data)
     end
 
     # Write one packet data

data/spec/mysql/packet_spec.rb

@@ -1,4 +1,6 @@
 # coding: binary
+require 'mysql/packet'
+
 describe Mysql::Packet do
   def self._(s)
     s.unpack('H*').first

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 == 20911
+    Mysql::VERSION.should == 20912
   end
 end
 
@@ -130,8 +130,8 @@ describe 'Mysql#options' do
   end
   it 'OPT_CONNECT_TIMEOUT: set timeout for connecting' do
     @m.options(Mysql::OPT_CONNECT_TIMEOUT, 0.1).should == @m
-    UNIXSocket.stub!(:new).and_return{sleep 1}
-    TCPSocket.stub!(:new).and_return{sleep 1}
+    UNIXSocket.stub(:new).and_return{sleep 1}
+    TCPSocket.stub(:new).and_return{sleep 1}
     proc{@m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)}.should raise_error Mysql::ClientError, 'connection timeout'
     proc{@m.connect}.should raise_error Mysql::ClientError, 'connection timeout'
   end
@@ -1442,66 +1442,66 @@ describe 'Mysql::Stmt' do
 
   it '#fetch tinyblob column' do
     @m.query 'create temporary table t (i tinyblob)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*255}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*255]]
   end
 
   it '#fetch tinytext column' do
     @m.query 'create temporary table t (i tinytext)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*255}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*255]]
   end
 
   it '#fetch blob column' do
     @m.query 'create temporary table t (i blob)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*65535}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*65535]]
   end
 
   it '#fetch text column' do
     @m.query 'create temporary table t (i text)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*65535}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*65535]]
   end
 
   it '#fetch mediumblob column' do
     @m.query 'create temporary table t (i mediumblob)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*16777215}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ['a'*16777215]]
   end
 
   it '#fetch mediumtext column' do
     @m.query 'create temporary table t (i mediumtext)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*16777215}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ['a'*16777215]]
   end
 
   it '#fetch longblob column' do
     @m.query 'create temporary table t (i longblob)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*16777216}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*16777216]]
   end
 
   it '#fetch longtext column' do
     @m.query 'create temporary table t (i longtext)'
-    @m.query "insert into t values (null),('abc')"
+    @m.query "insert into t values (null),('#{"a"*16777216}')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.entries.should == [[nil], ["abc"]]
+    @s.entries.should == [[nil], ["a"*16777216]]
   end
 
   it '#fetch enum column' do

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 2.9.11
+  version: 2.9.12
+  prerelease: 
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -29,28 +30,28 @@ 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: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: MySQL connector
 test_files:
 - spec/mysql_spec.rb
 - spec/mysql/packet_spec.rb
-has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7021fb12fc21daf12ea89138b4b10f9f95a68dd0
-  data.tar.gz: 71ab24b33c3eec96baeb7d242175a1591aa3952b
-SHA512:
-  metadata.gz: 85760ac7c8b6357ab21baf9a38fab0ade85c654f2375a038dda0c7a8052216eb6e3d0c8ce248bca660cca712e6b82548b5cb0539382939525f17c714a27a8602
-  data.tar.gz: bcac0ca18511fe52460591511559cda8c242815d5fa7844a559cc0a05c3a93db6c4cde5cf93bd7ed2f7e837f303926ecb10226dbc224f100a16f0ec5e28b7758