ruby-mysql 2.9.5 → 2.9.6

data/README.rdoc

@@ -64,5 +64,5 @@ MySQL connector for Ruby.
 == Copyright
 
 Author    :: TOMITA Masahiro <tommy@tmtm.org>
-Copyright :: Copyright (c) 2009-2010 TOMITA Masahiro
+Copyright :: Copyright (c) 2009-2012 TOMITA Masahiro
 License   :: Ruby's

data/lib/mysql.rb

@@ -16,7 +16,7 @@ class Mysql
   require "#{dir}/mysql/charset"
   require "#{dir}/mysql/protocol"
 
-  VERSION            = 20904               # Version number of this library
+  VERSION            = 20906               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 

data/lib/mysql/protocol.rb

@@ -93,7 +93,15 @@ class Mysql
         return data.slice!(0,4).unpack("e").first
       when Field::TYPE_DOUBLE
         return data.slice!(0,8).unpack("E").first
-      when Field::TYPE_DATE, Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
+      when Field::TYPE_DATE
+        len = data.slice!(0).ord
+        y, m, d = data.slice!(0,len).unpack("vCC")
+        t = Mysql::Time.new(y, m, d)
+        def t.to_s
+          sprintf "%04d-%02d-%02d", year, mon ,day
+        end
+        return t
+      when Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
         len = data.slice!(0).ord
         y, m, d, h, mi, s, bs = data.slice!(0,len).unpack("vCCCCCV")
         return Mysql::Time.new(y, m, d, h, mi, s, bs)
@@ -572,10 +580,10 @@ class Mysql
           len = (len2 << 8) + len1
           raise ProtocolError, "invalid packet: sequence number mismatch(#{seq} != #{@seq}(expected))" if @seq != seq
           @seq = (@seq + 1) % 256
-          buf = ''.force_encoding('ASCII-8BIT')
           l = len
           while l > 0
-            ret.concat @sock.sysread(l, buf)
+            buf = @sock.sysread l
+            ret.concat buf
             l -= buf.bytesize
           end
         end

data/spec/mysql_spec.rb

@@ -15,7 +15,7 @@ MYSQL_SOCKET   = ENV['MYSQL_SOCKET']
 
 describe 'Mysql::VERSION' do
   it 'returns client version' do
-    Mysql::VERSION.should == 20904
+    Mysql::VERSION.should == 20906
   end
 end
 
@@ -1266,9 +1266,15 @@ describe 'Mysql::Stmt' do
     @m.query "insert into t values ('0000-00-00'),('1000-01-01'),('9999-12-31')"
     @s.prepare 'select i from t'
     @s.execute
-    @s.fetch.should == [Mysql::Time.new]
-    @s.fetch.should == [Mysql::Time.new(1000,1,1)]
-    @s.fetch.should == [Mysql::Time.new(9999,12,31)]
+    cols = @s.fetch
+    cols.should == [Mysql::Time.new]
+    cols.first.to_s.should == '0000-00-00'
+    cols = @s.fetch
+    cols.should == [Mysql::Time.new(1000,1,1)]
+    cols.first.to_s.should == '1000-01-01'
+    cols = @s.fetch
+    cols.should == [Mysql::Time.new(9999,12,31)]
+    cols.first.to_s.should == '9999-12-31'
   end
 
   it '#fetch datetime column' do

metadata

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