Throw if invalid charset is specified for collation

Author: tgriesser

lib/ConnectionConfig.js

@@ -90,6 +90,10 @@ ConnectionConfig.getDefaultFlags = function(options) {
 ConnectionConfig.getCharsetNumber = function getCharsetNumber(charset, collation) {
   var num;
   if (collation) {
+    if (charset && (collation.split('_')[0].toUpperCase() !== charset.toUpperCase())) {
+      throw new TypeError('Invalid charset \'' + charset +
+        '\' specified with collation \'' + collation + '\'');
+    }
     num = this.getCollationNumber(collation);
   } else if (charset) {
     charset = Charsets[charset.toUpperCase()] || charset;

test/unit/test-ConnectionConfig.js

@@ -67,6 +67,21 @@ test('ConnectionConfig#Constructor', {
     assert.equal(config.charsetNumber, Collations.UTF8_GENERAL_CI);
   },
 
+  'throws if incompatible charset and collation are specified': function() {
+    var error;
+    try {
+      var config = new ConnectionConfig({
+        charset: 'latin1',
+        collation: 'UTF8MB4_BIN'
+      });
+    } catch (err) {
+      error = err;
+    }
+    assert.ok(error);
+    assert.equal(error.name, 'TypeError');
+    assert.equal(error.message, 'Invalid charset \'latin1\' specified with collation \'UTF8MB4_BIN\'');
+  }
+
 });
 
 test('ConnectionConfig#Constructor.connectTimeout', {