[mysql] correctly map config[:encoding] into Connector-J characterEncoding property

Author: kares

lib/arjdbc/mysql/connection_methods.rb

@@ -34,8 +34,13 @@ def mysql_connection(config)
       properties['zeroDateTimeBehavior'] ||= 'convertToNull'
       properties['jdbcCompliantTruncation'] ||= 'false'
       properties['useUnicode'] = 'true' unless properties.key?('useUnicode') # otherwise platform default
-      encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
-      properties['characterEncoding'] = encoding if encoding
+      # NOTE: this is "better" than passing what users are used to set on MRI
+      # e.g. 'utf8mb4' will fail cause the driver will check for a Java charset
+      # ... it's smart enough to detect utf8mb4 from server variables :
+      # "character_set_client" && "character_set_connection" (thus UTF-8)
+      if encoding = config.key?(:encoding) ? config[:encoding] : 'utf8'
+        properties['characterEncoding'] = convert_mysql_encoding(encoding) || encoding
+      end
       if ! ( reconnect = config[:reconnect] ).nil?
         properties['autoReconnect'] ||= reconnect.to_s
         # properties['maxReconnects'] ||= '3'
@@ -88,4 +93,53 @@ def mariadb_connection(config)
     mysql_connection(config)
   end
   alias_method :jdbcmariadb_connection, :mariadb_connection
+
+  private
+
+  @@mysql_encodings = nil
+
+  def convert_mysql_encoding(encoding) # from mysql2's ruby_enc_to_mysql
+    ( @@mysql_encodings ||= {
+      "big5" => "Big5",
+      "dec8" => nil,
+      "cp850" => "CP850",
+      "hp8" => nil,
+      "koi8r" => "KOI8-R",
+      "latin1" => "ISO-8859-1",
+      "latin2" => "ISO-8859-2",
+      "swe7" => nil,
+      "ascii" => "US-ASCII",
+      #"ujis" => "eucJP-ms",
+      #"sjis" => "Shift_JIS",
+      "hebrew" => "ISO-8859-8",
+      #"tis620" => "TIS-620",
+      #"euckr" => "EUC-KR",
+      #"koi8u" => "KOI8-R",
+      #"gb2312" => "GB2312",
+      "greek" => "ISO-8859-7",
+      "cp1250" => "Windows-1250",
+      #"gbk" => "GBK",
+      "latin5" => "ISO-8859-9",
+      "armscii8" => nil,
+      "utf8" => "UTF-8",
+      "ucs2" => "UTF-16BE",
+      "cp866" => "IBM866",
+      "keybcs2" => nil,
+      #"macce" => "macCentEuro",
+      #"macroman" => "macRoman",
+      "cp852" => "CP852",
+      "latin7" => "ISO-8859-13",
+      "utf8mb4" => "UTF-8",
+      "cp1251" => "Windows-1251",
+      "utf16" => "UTF-16",
+      "cp1256" => "Windows-1256",
+      "cp1257" => "Windows-1257",
+      "utf32" => "UTF-32",
+      "binary" => "ASCII-8BIT",
+      "geostd8" => nil,
+      #"cp932" => "Windows-31J",
+      #"eucjpms" => "eucJP-ms"
+    } )[ encoding ]
+  end
+
 end