ruby-mysql 2.9.3 → 2.9.4

data/lib/mysql/protocol.rb

@@ -563,13 +563,15 @@ class Mysql
       len = nil
       begin
         Timeout.timeout @read_timeout do
-          header = @sock.read(4)
+          header = @sock.sysread(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.concat @sock.read(len)
+          ret.concat @sock.sysread(len)
         end
+      rescue EOFError
+        raise ClientError::ServerGoneError, 'The MySQL server has gone away'
       rescue Timeout::Error
         raise ClientError, "read timeout"
       end while len == MAX_PACKET_LENGTH
@@ -616,6 +618,8 @@ class Mysql
         Timeout.timeout @write_timeout do
           @sock.flush
         end
+      rescue Errno::EPIPE
+        raise ClientError::ServerGoneError, 'The MySQL server has gone away'
       rescue Timeout::Error
         raise ClientError, "write timeout"
       end
@@ -663,7 +667,6 @@ class Mysql
         rest_scramble_buff = data.unpack("CZ*Va8CvCva13Z13")
         raise ProtocolError, "unsupported version: #{protocol_version}" unless protocol_version == VERSION
         raise ProtocolError, "invalid packet: f0=#{f0}" unless f0 == 0
-        raise ProtocolError, "invalid packet: f1=#{f1.inspect}" unless f1 == "\0\0\0\0\0\0\0\0\0\0\0\0\0"
         scramble_buff.concat rest_scramble_buff
         self.new protocol_version, server_version, thread_id, server_capabilities, server_charset, server_status, scramble_buff
       end

data/lib/mysql.rb

@@ -16,7 +16,7 @@ class Mysql
   require "#{dir}/mysql/charset"
   require "#{dir}/mysql/protocol"
 
-  VERSION            = 20903               # Version number of this library
+  VERSION            = 20904               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -125,6 +125,15 @@ class Mysql
     return self
   end
 
+  # Disconnect from mysql without QUIT packet.
+  def close!
+    if @protocol
+      @protocol.close
+      @protocol = nil
+    end
+    return self
+  end
+
   # Set option for connection.
   #
   # Available options:
@@ -258,6 +267,7 @@ class Mysql
   # === Return
   # [String] server version
   def server_info
+    check_connection
     @protocol.server_info
   end
   alias get_server_info server_info
@@ -265,6 +275,7 @@ class Mysql
   # === Return
   # [Integer] server version
   def server_version
+    check_connection
     @protocol.server_version
   end
   alias get_server_version server_version
@@ -287,6 +298,7 @@ class Mysql
   # === Return
   # self
   def kill(pid)
+    check_connection
     @protocol.kill_command pid
     self
   end
@@ -314,6 +326,7 @@ class Mysql
   # === Example
   #  my.query("select 1,NULL,'abc'").fetch  # => [1, nil, "abc"]
   def query(str, &block)
+    check_connection
     @fields = nil
     begin
       nfields = @protocol.query_command str
@@ -348,6 +361,7 @@ class Mysql
   # === Return
   # [Mysql::Result]
   def store_result
+    check_connection
     raise ClientError, 'invalid usage' unless @result_exist
     res = Result.new @fields, @protocol
     @server_status = @protocol.server_status
@@ -359,6 +373,7 @@ class Mysql
   # === Return
   # [Integer] Thread ID
   def thread_id
+    check_connection
     @protocol.thread_id
   end
 
@@ -373,6 +388,7 @@ class Mysql
   # === Return
   # self
   def set_server_option(opt)
+    check_connection
     @protocol.set_option_command opt
     self
   end
@@ -388,6 +404,7 @@ class Mysql
   # true if next query exists.
   def next_result
     return false unless more_results
+    check_connection
     @fields = nil
     nfields = @protocol.get_result
     if nfields
@@ -423,6 +440,7 @@ class Mysql
   # === Return
   # [Mysql::Result]
   def list_fields(table, field=nil)
+    check_connection
     begin
       fields = @protocol.field_list_command table, field
       return Result.new fields
@@ -437,6 +455,7 @@ class Mysql
   # === Return
   # [Mysql::Result]
   def list_processes
+    check_connection
     @fields = @protocol.process_info_command
     @result_exist = true
     store_result
@@ -459,6 +478,7 @@ class Mysql
   # === Return
   # self
   def ping
+    check_connection
     @protocol.ping_command
     self
   end
@@ -469,6 +489,7 @@ class Mysql
   # === Return
   # self
   def refresh(op)
+    check_connection
     @protocol.refresh_command op
     self
   end
@@ -492,6 +513,7 @@ class Mysql
   # === Return
   # self
   def shutdown(level=0)
+    check_connection
     @protocol.shutdown_command level
     self
   end
@@ -499,7 +521,7 @@ class Mysql
   # === Return
   # [String] statistics message
   def stat
-    @protocol.statistics_command
+    @protocol ? @protocol.statistics_command : 'MySQL server has gone away'
   end
 
   # Commit transaction
@@ -528,6 +550,12 @@ class Mysql
     self
   end
 
+  private
+
+  def check_connection
+    raise ClientError::ServerGoneError, 'The MySQL server has gone away' unless @protocol
+  end
+
   # Field class
   class Field
     attr_reader :db             # database name

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mysql
 version: !ruby/object:Gem::Version 
-  version: 2.9.3
+  prerelease: false
+  segments: 
+  - 2
+  - 9
+  - 4
+  version: 2.9.4
 platform: ruby
 authors: 
 - tommy
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +09:00
+date: 2010-12-29 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -51,21 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubymysql
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: MySQL connector for Ruby