ruby-mysql 2.9.8 → 2.9.9

data/lib/mysql.rb

@@ -14,13 +14,13 @@ class Mysql
   require "mysql/error"
   require "mysql/charset"
   require "mysql/protocol"
+  require "mysql/packet.rb"
   begin
-    require "mysql/packet.so"
+    require "mysql/ext.so"
   rescue LoadError
-    require "mysql/packet.rb"
   end
 
-  VERSION            = 20908               # Version number of this library
+  VERSION            = 20909               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -1054,6 +1054,7 @@ class Mysql
     # @param [Boolean] neg negative flag
     # @param [Integer] second_part
     def initialize(year=0, month=0, day=0, hour=0, minute=0, second=0, neg=false, second_part=0)
+      @date_flag = !(hour && minute && second)
       @year, @month, @day, @hour, @minute, @second, @neg, @second_part =
         year.to_i, month.to_i, day.to_i, hour.to_i, minute.to_i, second.to_i, neg, second_part.to_i
     end
@@ -1077,7 +1078,9 @@ class Mysql
 
     # @return [String] "yyyy-mm-dd HH:MM:SS"
     def to_s
-      if year == 0 and mon == 0 and day == 0
+      if @date_flag
+        sprintf "%04d-%02d-%02d", year, mon, day
+      elsif year == 0 and mon == 0 and day == 0
         h = neg ? hour * -1 : hour
         sprintf "%02d:%02d:%02d", h, min, sec
       else

data/lib/mysql/protocol.rb

@@ -44,15 +44,12 @@ class Mysql
       when Field::TYPE_DATE
         len = pkt.utiny
         y, m, d = pkt.read(len).unpack("vCC")
-        t = Mysql::Time.new(y, m, d)
-        def t.to_s
-          sprintf "%04d-%02d-%02d", year, mon ,day
-        end
+        t = Mysql::Time.new(y, m, d, nil, nil, nil)
         return t
       when Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
         len = pkt.utiny
-        y, m, d, h, mi, s, bs = pkt.read(len).unpack("vCCCCCV")
-        return Mysql::Time.new(y, m, d, h, mi, s, bs)
+        y, m, d, h, mi, s, sp = pkt.read(len).unpack("vCCCCCV")
+        return Mysql::Time.new(y, m, d, h, mi, s, false, sp)
       when Field::TYPE_TIME
         len = pkt.utiny
         sign, d, h, mi, s, sp = pkt.read(len).unpack("CVCCCV")
@@ -423,10 +420,11 @@ class Mysql
     # [Array of Array of Object] all records
     def stmt_retr_all_records(fields, charset)
       check_state :RESULT
+      enc = charset.encoding
       begin
         all_recs = []
-        until (data = read).eof?
-          all_recs.push StmtRawRecord.new(data, fields, charset.encoding)
+        until (pkt = read).eof?
+          all_recs.push StmtRawRecord.new(pkt, fields, enc)
         end
         all_recs
       ensure
@@ -494,13 +492,13 @@ class Mysql
       begin
         Timeout.timeout @read_timeout do
           header = @sock.read(4)
-          raise EOFError unless header.length == 4
+          raise EOFError unless header && header.length == 4
           len1, len2, seq = header.unpack("CvC")
           len = (len2 << 8) + len1
           raise ProtocolError, "invalid packet: sequence number mismatch(#{seq} != #{@seq}(expected))" if @seq != seq
           @seq = (@seq + 1) % 256
           ret = @sock.read(len)
-          raise EOFError unless ret.length == len
+          raise EOFError unless ret && ret.length == len
         end
       rescue EOFError
         raise ClientError::ServerGoneError, 'The MySQL server has gone away'

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 == 20908
+    Mysql::VERSION.should == 20909
   end
 end
 
@@ -649,6 +649,7 @@ end
 describe 'Mysql::Result' do
   before do
     @m = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+    @m.charset = 'latin1'
     @m.query 'create temporary table t (id int, str char(10), primary key (id))'
     @m.query "insert into t values (1,'abc'),(2,'defg'),(3,'hi'),(4,null)"
     @res = @m.query 'select * from t'
@@ -808,6 +809,7 @@ end
 describe 'Mysql::Field' do
   before do
     @m = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+    @m.charset = 'latin1'
     @m.query 'create temporary table t (id int default 0, str char(10), primary key (id))'
     @m.query "insert into t values (1,'abc'),(2,'defg'),(3,'hi'),(4,null)"
     @res = @m.query 'select * from t'
@@ -1065,6 +1067,99 @@ describe 'Mysql::Stmt' do
     end
   end
 
+  describe '#execute with various integer value:' do
+    before do
+      @m.query('create temporary table t (i bigint)')
+    end
+    [
+      -9223372036854775808,
+      -9223372036854775807,
+      -4294967297,
+      -4294967296,
+      -4294967295,
+      -2147483649,
+      -2147483648,
+      -2147483647,
+      -65537,
+      -65536,
+      -65535,
+      -32769,
+      -32768,
+      -32767,
+      -257,
+      -256,
+      -255,
+      -129,
+      -128,
+      -127,
+      0,
+      126,
+      127,
+      128,
+      254,
+      255,
+      256,
+      32766,
+      32767,
+      32768,
+      65534,
+      65535,
+      65536,
+      2147483646,
+      2147483647,
+      2147483648,
+      4294967294,
+      4294967295,
+      4294967296,
+      9223372036854775806,
+      9223372036854775807,
+    ].each do |n|
+      it "#{n} is #{n}" do
+        @s.prepare 'insert into t values (?)'
+        @s.execute n
+        @m.query('select i from t').fetch.should == ["#{n}"]
+      end
+    end
+  end
+
+  describe '#execute with various unsigned integer value:' do
+    before do
+      @m.query('create temporary table t (i bigint unsigned)')
+    end
+    [
+      0,
+      126,
+      127,
+      128,
+      254,
+      255,
+      256,
+      32766,
+      32767,
+      32768,
+      65534,
+      65535,
+      65536,
+      2147483646,
+      2147483647,
+      2147483648,
+      4294967294,
+      4294967295,
+      4294967296,
+      9223372036854775806,
+      9223372036854775807,
+      9223372036854775808,
+      18446744073709551614,
+      18446744073709551615,
+    ].each do |n|
+      it "#{n} is #{n}" do
+        @s.prepare 'insert into t values (?)'
+        @s.execute n
+        @m.query('select i from t').fetch.should == ["#{n}"]
+      end
+    end
+  end
+
   it '#fetch returns result-record' do
     @s.prepare 'select 123, "abc", null'
     @s.execute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 2.9.8
+  version: 2.9.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org