Pass flag parsing (split) to ConnectionConfig.mergeFlags

dresende · dresende · commit 7e224fb028d0 · 2012-11-02T20:24:22.000Z
This way, tests can also check for correct flag string splitting
diff --git a/lib/ConnectionConfig.js b/lib/ConnectionConfig.js
@@ -34,13 +34,13 @@ function ConnectionConfig(options) {
     : Charsets.UTF8_GENERAL_CI;
 
   this.clientFlags = ConnectionConfig.mergeFlags(ConnectionConfig.getDefaultFlags(options),
-                                                 (options.flags || '').toUpperCase().split(/\s*,+\s*/));
+                                                 options.flags || '');
 }
 
 ConnectionConfig.mergeFlags = function(default_flags, user_flags) {
   var flags = 0x0, i;
 
-  user_flags = user_flags || [];
+  user_flags = (user_flags || '').toUpperCase().split(/\s*,+\s*/);
 
   // add default flags unless "blacklisted"
   for (i in default_flags) {
diff --git a/test/integration/connection/test-connection-config-flags.js b/test/integration/connection/test-connection-config-flags.js
@@ -4,41 +4,45 @@ var assert           = require('assert');
 
 var testFlags = [{
   'default' : [ '' ],
-  'user'    : [ 'LONG_PASSWORD' ],
+  'user'    : 'LONG_PASSWORD',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD
 }, {
   'default' : [ '' ],
-  'user'    : [ '-LONG_PASSWORD' ],
+  'user'    : '-LONG_PASSWORD',
   'expected': 0x0
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ '-LONG_PASSWORD' ],
+  'user'    : '-LONG_PASSWORD',
   'expected': ClientConstants.CLIENT_FOUND_ROWS
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ '-FOUND_ROWS' ],
+  'user'    : '-FOUND_ROWS',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ '-LONG_FLAG' ],
+  'user'    : '-LONG_FLAG',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD |
               ClientConstants.CLIENT_FOUND_ROWS
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ 'LONG_FLAG' ],
+  'user'    : 'LONG_FLAG',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD |
               ClientConstants.CLIENT_FOUND_ROWS |
               ClientConstants.CLIENT_LONG_FLAG
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ 'UNDEFINED_CONSTANT' ],
+  'user'    : 'UNDEFINED_CONSTANT',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD |
               ClientConstants.CLIENT_FOUND_ROWS
 }, {
   'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
-  'user'    : [ '-UNDEFINED_CONSTANT' ],
+  'user'    : '-UNDEFINED_CONSTANT',
   'expected': ClientConstants.CLIENT_LONG_PASSWORD |
               ClientConstants.CLIENT_FOUND_ROWS
+}, {
+  'default' : [ 'LONG_PASSWORD', 'FOUND_ROWS' ],
+  'user'    : '-UNDEFINED_CONSTANT,,  -found_ROWS',
+  'expected': ClientConstants.CLIENT_LONG_PASSWORD
 }];
 
 for (var i = 0; i < testFlags.length; i++) {
