Accept lower-case charset option

Author: dougwilson

Changes.md

@@ -10,6 +10,7 @@ you spot any mistakes.
 * Make callback to `pool.query` optional like `conn.query` #585
 * Prevent enqueuing sequences after fatal error #400
 * Fix geometry parser for empty fields #742
+* Accept lower-case charset option
 
 ## v2.1.1 (2014-03-13)
 

Readme.md

@@ -138,7 +138,7 @@ When establishing a connection, you can set the following options:
 * `user`: The MySQL user to authenticate as.
 * `password`: The password of that MySQL user.
 * `database`: Name of the database to use for this connection (Optional).
-* `charset`: The charset for the connection. (Default: `'UTF8_GENERAL_CI'`. Value needs to be all in upper case letters!)
+* `charset`: The charset for the connection. (Default: `'UTF8_GENERAL_CI'`)
 * `timezone`: The timezone used to store local dates. (Default: `'local'`)
 * `connectTimeout`: The milliseconds before a timeout occurs during the initial connection
   to the MySQL server. (Default: no timeout)

lib/ConnectionConfig.js

@@ -84,8 +84,8 @@ ConnectionConfig.getDefaultFlags = function(options) {
   return defaultFlags;
 };
 
-ConnectionConfig.getCharsetNumber = function(charset) {
-  return Charsets[charset];
+ConnectionConfig.getCharsetNumber = function getCharsetNumber(charset) {
+  return Charsets[charset.toUpperCase()];
 };
 
 ConnectionConfig.parseUrl = function(url) {

test/unit/test-ConnectionConfig.js

@@ -26,4 +26,12 @@ test('ConnectionConfig#Constructor', {
     assert.equal(config.debug, true);
     assert.equal(config.charsetNumber, Charsets.BIG5_CHINESE_CI);
   },
+
+  'allows case-insensitive charset name': function() {
+    var config = new ConnectionConfig({
+      charset: 'big5_chinese_ci',
+    });
+
+    assert.equal(config.charsetNumber, Charsets.BIG5_CHINESE_CI);
+  },
 });