tmtm-ruby-mysql 3.0.1 → 3.0.2

data/ChangeLog

@@ -1,3 +1,23 @@
+2009-07-29  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql/protocol.rb: treat M17N string correctly.
+
+2009-07-28  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql.rb, lib/mysql/protocol.rb: add Mysql#list_fields.
+
+2009-07-27  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql.rb, lib/mysql/protocol.rb: performance tuning
+
+2009-07-24  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql.rb: correspond to Ruby 1.9.1.
+
+2009-07-14  TOMITA Masahiro  <tommy@tmtm.org>
+
+	*  mysql.rb: Fix that Mysql#close is incorrect.
+
 2009-07-12  TOMITA Masahiro  <tommy@tmtm.org>
 
 	* version 3.0.1-alpha

data/lib/mysql.rb

@@ -169,6 +169,7 @@ class Mysql
   def close
     if @protocol
       @protocol.synchronize do
+        @protocol.reset
         @protocol.send_packet Protocol::QuitPacket.new
         @protocol.close
         @protocol = nil
@@ -228,7 +229,7 @@ class Mysql
             res_packet.affected_rows, res_packet.insert_id, res_packet.server_status, res_packet.warning_count
           return nil
         else
-          @fields = (1..res_packet.field_count).map{Field.new @protocol.read_field_packet}
+          @fields = Array.new(res_packet.field_count).map{Field.new @protocol.read_field_packet}
           @protocol.read_eof_packet
           return SimpleQueryResult.new self, @fields
         end
@@ -313,6 +314,28 @@ class Mysql
     return st
   end
 
+  # Get field(column) list
+  # === Argument
+  # table :: [String] table name.
+  # === Return
+  # Array of Mysql::Field
+  def list_fields(table)
+    @protocol.synchronize do
+      begin
+        @protocol.reset
+        @protocol.send_packet Protocol::FieldListPacket.new(table)
+        fields = []
+        until Protocol.eof_packet?(data = @protocol.read)
+          fields.push Field.new(Protocol::FieldPacket.parse(data))
+        end
+        return fields
+      rescue ServerError => e
+        @sqlstate = e.sqlstate
+        raise
+      end
+    end
+  end
+
   private
 
   # analyze argument and returns connection-parameter and option.
@@ -517,25 +540,49 @@ class Mysql
       ret
     end
 
+    MYSQL_RUBY_TYPE = {
+      Field::TYPE_BIT         => :binary,
+      Field::TYPE_DECIMAL     => :string,
+      Field::TYPE_VARCHAR     => :string,
+      Field::TYPE_NEWDECIMAL  => :string,
+      Field::TYPE_TINY_BLOB   => :string,
+      Field::TYPE_MEDIUM_BLOB => :string,
+      Field::TYPE_LONG_BLOB   => :string,
+      Field::TYPE_BLOB        => :string,
+      Field::TYPE_VAR_STRING  => :string,
+      Field::TYPE_STRING      => :string,
+      Field::TYPE_TINY        => :integer,
+      Field::TYPE_SHORT       => :integer,
+      Field::TYPE_LONG        => :integer,
+      Field::TYPE_LONGLONG    => :integer,
+      Field::TYPE_INT24       => :integer,
+      Field::TYPE_YEAR        => :integer,
+      Field::TYPE_FLOAT       => :float,
+      Field::TYPE_DOUBLE      => :float,
+      Field::TYPE_TIMESTAMP   => :datetime,
+      Field::TYPE_DATE        => :datetime,
+      Field::TYPE_DATETIME    => :datetime,
+      Field::TYPE_NEWDATE     => :datetime,
+      Field::TYPE_TIME        => :time,
+    }
+
     def convert_str_to_ruby_value(field, value, charset)
       return nil if value.nil?
-      case field.type
-      when Field::TYPE_BIT, Field::TYPE_DECIMAL, Field::TYPE_VARCHAR,
-        Field::TYPE_NEWDECIMAL, Field::TYPE_TINY_BLOB,
-        Field::TYPE_MEDIUM_BLOB, Field::TYPE_LONG_BLOB,
-        Field::TYPE_BLOB, Field::TYPE_VAR_STRING, Field::TYPE_STRING
+      case MYSQL_RUBY_TYPE[field.type]
+      when :binary
+        Charset.to_binary(value)
+      when :string
         field.flags & Field::BINARY_FLAG == 0 ? charset.force_encoding(value) : Charset.to_binary(value)
-      when Field::TYPE_TINY, Field::TYPE_SHORT, Field::TYPE_LONG,
-        Field::TYPE_LONGLONG, Field::TYPE_INT24, Field::TYPE_YEAR
+      when :integer
         value.to_i
-      when Field::TYPE_FLOAT, Field::TYPE_DOUBLE
+      when :float
         value.to_f
-      when Field::TYPE_TIMESTAMP, Field::TYPE_DATE, Field::TYPE_DATETIME, Field::TYPE_NEWDATE
+      when :datetime
         unless value =~ /\A(\d\d\d\d).(\d\d).(\d\d)(?:.(\d\d).(\d\d).(\d\d))?\z/
           raise "unsupported format date type: #{value}"
         end
         Time.new($1, $2, $3, $4, $5, $6)
-      when Field::TYPE_TIME
+      when :time
         unless value =~ /\A(-?)(\d+).(\d\d).(\d\d)?\z/
           raise "unsupported format time type: #{value}"
         end
@@ -562,14 +609,20 @@ class Mysql
     def parse_data(data, fields, charset)
       return nil if Protocol.eof_packet? data
       data.slice!(0)  # skip first byte
-      null_bit_map = data.slice!(0, (fields.length+7+2)/8).unpack("C*")
-      ret = (0...fields.length).map do |i|
-        if null_bit_map[(i+2)/8][(i+2)%8] == 1
+      null_bit_map = data.slice!(0, (fields.length+7+2)/8).unpack("b*").first
+      ret = fields.each_with_index.map do |f, i|
+        if null_bit_map[i+2] == ?1
           nil
         else
-          unsigned = fields[i].flags & Field::UNSIGNED_FLAG != 0
-          v = Protocol.net2value(data, fields[i].type, unsigned)
-          fields[i].flags & Field::BINARY_FLAG == 0 ? charset.force_encoding(v) : Charset.to_binary(v)
+          unsigned = f.flags & Field::UNSIGNED_FLAG != 0
+          v = Protocol.net2value(data, f.type, unsigned)
+          if v.is_a? Numeric or v.is_a? Mysql::Time
+            v
+          elsif f.type == Field::TYPE_BIT or f.flags & Field::BINARY_FLAG != 0
+            Charset.to_binary(v)
+          else
+            charset.force_encoding(v)
+          end
         end
       end
       ret
@@ -619,7 +672,7 @@ class Mysql
             @protocol.read_eof_packet
           end
           if res_packet.field_count > 0
-            fields = (1..res_packet.field_count).map{Field.new @protocol.read_field_packet}
+            fields = Array.new(res_packet.field_count).map{Field.new @protocol.read_field_packet}
             @protocol.read_eof_packet
           else
             fields = []
@@ -656,7 +709,7 @@ class Mysql
               res_packet.affected_rows, res_packet.insert_id, res_packet.server_status, res_packet.warning_count
             return nil
           end
-          @fields = (1..res_packet.field_count).map{Field.new @protocol.read_field_packet}
+          @fields = Array.new(res_packet.field_count).map{Field.new @protocol.read_field_packet}
           @protocol.read_eof_packet
           return StatementResult.new(@mysql, @fields)
         rescue ServerError => e

data/lib/mysql/protocol.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008 TOMITA Masahiro
+# Copyright (C) 2008-2009 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 require "socket"
@@ -25,6 +25,7 @@ class Mysql
 
     # convert String to LengthCodedString
     def self.lcs(str)
+      str = Charset.to_binary str
       lcb(str.length)+str
     end
 
@@ -35,24 +36,19 @@ class Mysql
     # Integer or nil
     def self.lcb2int!(lcb)
       return nil if lcb.empty?
-      case ord lcb
-      when 251
-        ord! lcb
+      case v = lcb.slice!(0)
+      when ?\xfb
         return nil
-      when 252
-        _, v = lcb.unpack("Cv")
-        lcb[0, 3] = ""
-        return v
-      when 253
-        v, = lcb.unpack("V")
-        lcb[0, 4] = ""
-        return v >> 8
-      when 254
-        _, v1, v2 = lcb.unpack("CVV")
-        lcb[0, 9] = ""
-        return (v2 << 32) | v1
+      when ?\xfc
+        return lcb.slice!(0,2).unpack("v").first
+      when ?\xfd
+        c, v = lcb.slice!(0,3).unpack("Cv")
+        return (v<<8)+c
+      when ?\xfe
+        v1, v2 = lcb.slice!(0,8).unpack("VV")
+        return (v2<<32)+v1
       else
-        return ord!(lcb)
+        return v.ord
       end
     end
 
@@ -67,7 +63,7 @@ class Mysql
     end
 
     def self.eof_packet?(data)
-      ord(data) == 0xfe && data.length == 5
+      data[0] == ?\xfe && data.length == 5
     end
 
     # Convert netdata to Ruby value
@@ -82,7 +78,7 @@ class Mysql
       when Field::TYPE_STRING, Field::TYPE_VAR_STRING, Field::TYPE_NEWDECIMAL, Field::TYPE_BLOB
         return Protocol.lcs2str!(data)
       when Field::TYPE_TINY
-        v = ord! data
+        v = data.slice!(0).ord
         return unsigned ? v : v < 128 ? v : v-256
       when Field::TYPE_SHORT
         v = data.slice!(0,2).unpack("v").first
@@ -99,11 +95,11 @@ class Mysql
       when Field::TYPE_DOUBLE
         return data.slice!(0,8).unpack("E").first
       when Field::TYPE_DATE, Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
-        len = ord! data
+        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)
       when Field::TYPE_TIME
-        len = ord! data
+        len = data.slice!(0).ord
         sign, d, h, mi, s, sp = data.slice!(0,len).unpack("CVCCCV")
         h = d.to_i * 24 + h.to_i
         return Mysql::Time.new(0, 0, 0, h, mi, s, sign!=0, sp)
@@ -177,22 +173,6 @@ class Mysql
       return type, val
     end
 
-    if "".respond_to? :ord
-      def self.ord(str)
-        str.ord
-      end
-      def self.ord!(str)
-        str.slice!(0).ord
-      end
-    else
-      def self.ord(str)
-        str[0]
-      end
-      def self.ord!(str)
-        str.slice!(0)
-      end
-    end
-
     attr_reader :sqlstate
 
     # make socket connection to server.
@@ -262,7 +242,7 @@ class Mysql
       @sqlstate = "00000"
 
       # Error packet
-      if Protocol.ord(ret) == 0xff
+      if ret[0] == ?\xff
         f, errno, marker, @sqlstate, message = ret.unpack("Cvaa5a*")
         unless marker == "#"
           f, errno, message = ret.unpack("Cva*")    # Version 4.0 Error
@@ -483,7 +463,7 @@ class Mysql
     # Prepare result packet
     class PrepareResultPacket < RxPacket
       def self.parse(data)
-        raise ProtocolError, "invalid packet" unless Protocol.ord!(data) == 0x00
+        raise ProtocolError, "invalid packet" unless data.slice!(0) == ?\0
         statement_id, field_count, param_count, f, warning_count = data.unpack("VvvCv")
         raise ProtocolError, "invalid packet" unless f == 0x00
         self.new statement_id, field_count, param_count, warning_count
@@ -554,5 +534,17 @@ class Mysql
         [Mysql::COM_STMT_CLOSE, statement_id].pack("CV")
       end
     end
+
+    class FieldListPacket < TxPacket
+      attr_accessor :table, :field
+
+      def initialize(*args)
+        @table, @field = args
+      end
+
+      def serialize
+        [Mysql::COM_FIELD_LIST, "#{@table}\0#{@field}"].pack("Ca*")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmtm-ruby-mysql
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - tommy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/mysql.rb
 has_rdoc: true
 homepage: http://github.com/tmtm/ruby-mysql
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubymysql
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: MySQL connector for Ruby