sequel 3.12.0 → 3.12.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 3.12.1 (2010-06-09)
+
+* Make :encoding option work on MySQL even if config file specifies different encoding (jeremyevans) (#300)
+
 === 3.12.0 (2010-06-01)
 
 * Add a :deferrable option to foreign_key for creating deferrable foreign keys (hydrow)

data/lib/sequel/adapters/mysql.rb

@@ -99,6 +99,11 @@ module Sequel
         conn = Mysql.init
         conn.options(Mysql::READ_DEFAULT_GROUP, opts[:config_default_group] || "client")
         conn.options(Mysql::OPT_LOCAL_INFILE, opts[:config_local_infile]) if opts.has_key?(:config_local_infile)
+        if encoding = opts[:encoding] || opts[:charset]
+          # Set encoding before connecting so that the mysql driver knows what
+          # encoding we want to use, but this can be overridden by READ_DEFAULT_GROUP.
+          conn.options(Mysql::SET_CHARSET_NAME, encoding)
+        end
         conn.real_connect(
           opts[:host] || 'localhost',
           opts[:user],
@@ -110,11 +115,11 @@ module Sequel
           Mysql::CLIENT_MULTI_STATEMENTS +
           (opts[:compress] == false ? 0 : Mysql::CLIENT_COMPRESS)
         )
-        if encoding = opts[:encoding] || opts[:charset]
-          # Setting encoding before the connect appears not to work
-          # with READ_DEFAULT_GROUP, so set it afterwards.
-          conn.options(Mysql::SET_CHARSET_NAME, encoding)
-        end
+        # Set encoding a slightly different way after connecting,
+        # in case the READ_DEFAULT_GROUP overrode the provided encoding.
+        # Doesn't work across implicit reconnects, but Sequel doesn't turn on
+        # that feature.
+        conn.query("set names #{literal(encoding.to_s)}") if encoding
 
         # increase timeout so mysql server doesn't disconnect us
         conn.query("set @@wait_timeout = #{opts[:timeout] || 2592000}")

data/lib/sequel/version.rb

@@ -1,7 +1,7 @@
 module Sequel
   MAJOR = 3
   MINOR = 12
-  TINY  = 0
+  TINY  = 1
   
   VERSION = [MAJOR, MINOR, TINY].join('.')
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -07:00
+date: 2010-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: []