ruby-mysql 2.9.2 → 2.9.3

data/ChangeLog

@@ -1,3 +1,17 @@
+2010-06-06  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql/charset.rb: support tis620 charset.
+
+	* lib/mysql/charset.rb, lib/mysql/protocol.rb: convert encoding to
+	Encoding.default_internal.
+
+2010-05-06  TOMITA Masahiro  <tommy@tmtm.org>
+
+	* lib/mysql.rb (Mysql#connect): Fix: Mysql.connect ignore flag.
+
+	* spec/mysql_spec.rb: use environment variables for MySQL
+	connection.
+
 2010-01-17  TOMITA Masahiro  <tommy@tmtm.org>
 
 	* lib/mysql.rb (Mysql#errno): Fix: Mysql#errno's default value

data/lib/mysql.rb

@@ -16,7 +16,7 @@ class Mysql
   require "#{dir}/mysql/charset"
   require "#{dir}/mysql/protocol"
 
-  VERSION            = 20900               # Version number of this library
+  VERSION            = 20903               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -108,7 +108,7 @@ class Mysql
   # self
   def connect(host=nil, user=nil, passwd=nil, db=nil, port=nil, socket=nil, flag=nil)
     @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout
-    @protocol.authenticate user, passwd, db, (@local_infile ? CLIENT_LOCAL_FILES : 0), @charset
+    @protocol.authenticate user, passwd, db, (@local_infile ? CLIENT_LOCAL_FILES : 0) | (flag || 0), @charset
     @charset ||= @protocol.charset
     @host_info = (host.nil? || host == "localhost") ? 'Localhost via UNIX socket' : "#{host} via TCP/IP"
     query @init_command if @init_command

data/lib/mysql/charset.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008 TOMITA Masahiro
+# Copyright (C) 2008-2010 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 require "#{File.dirname __FILE__}/error"
@@ -207,7 +207,7 @@ class Mysql
         "macroman" => Encoding::MacRoman,
         "sjis"     => Encoding::SHIFT_JIS,
         "swe7"     => nil,
-        "tis620"   => nil,
+        "tis620"   => Encoding::TIS_620,
         "ucs2"     => Encoding::UTF_16BE,
         "ujis"     => Encoding::EucJP_ms,
         "utf8"     => Encoding::UTF_8,
@@ -217,6 +217,16 @@ class Mysql
         value.dup.force_encoding Encoding::ASCII_8BIT
       end
 
+      # convert raw to encoding and convert to Encoding.default_internal
+      # === Argument
+      # raw :: [String]
+      # charset :: [Mysql::Charset]
+      # === Return
+      # result [String]
+      def self.convert_encoding(raw, encoding)
+        raw.dup.force_encoding(encoding).encode
+      end
+
       # retrun corresponding Ruby encoding
       # === Return
       # encoding [Encoding]
@@ -234,14 +244,6 @@ class Mysql
         value
       end
 
-      # convert encoding from MySQL charset to Ruby
-      def force_encoding(value)
-        if value.is_a? String
-          value = value.dup.force_encoding encoding
-        end
-        value
-      end
-
     else
       # for Ruby 1.8
 
@@ -249,6 +251,10 @@ class Mysql
         value
       end
 
+      def self.convert_encoding(raw, encoding)
+        raw
+      end
+
       def encoding
         nil
       end
@@ -257,9 +263,6 @@ class Mysql
         value
       end
 
-      def force_encoding(value)
-        value
-      end
     end
   end
 end

data/lib/mysql/protocol.rb

@@ -335,7 +335,7 @@ class Mysql
         until self.class.eof_packet?(data = read)
           rec = fields.map do
             s = self.class.lcs2str!(data)
-            s && charset.force_encoding(s)
+            s && Charset.convert_encoding(s, charset.encoding)
           end
           all_recs.push rec
         end
@@ -513,7 +513,7 @@ class Mysql
           elsif f.type == Field::TYPE_BIT or f.flags & Field::BINARY_FLAG != 0
             Charset.to_binary(v)
           else
-            charset.force_encoding(v)
+            Charset.convert_encoding(v, charset.encoding)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-mysql
 version: !ruby/object:Gem::Version 
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors: 
 - tommy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +09:00
+date: 2010-06-06 00:00:00 +09:00
 default_executable: 
 dependencies: []