Merge pull request #2938 from ksmithut/master

Fixes authentication credentials not being passed in db connection string, and passing options

lib/sequelize.js

@@ -104,6 +104,9 @@ module.exports = (function() {
     if (arguments.length === 1 || (arguments.length === 2 && typeof username === 'object')) {
     if (arguments.length === 1 || (arguments.length === 2 && typeof username === 'object')) {
       options = username || {};
       options = username || {};
       urlParts = url.parse(arguments[0]);
       urlParts = url.parse(arguments[0]);
+      // reset username and password to null so we don't pass the options as the username
+      username = null;
+      password = null;
 
 
       // SQLite don't have DB in connection url
       // SQLite don't have DB in connection url
       if (urlParts.pathname) {
       if (urlParts.pathname) {
@@ -1066,7 +1069,7 @@ module.exports = (function() {
 
 
     if (last && Utils._.isPlainObject(last) && last.hasOwnProperty('logging')) {
     if (last && Utils._.isPlainObject(last) && last.hasOwnProperty('logging')) {
       options = last;
       options = last;
-      
+
       // remove options from set of logged arguments
       // remove options from set of logged arguments
       args.splice(args.length-1, 1);
       args.splice(args.length-1, 1);
     } else {
     } else {

test/configuration.test.js

@@ -84,6 +84,14 @@ describe(Support.getTestDialectTeaser('Configuration'), function() {
       done();
       done();
     });
     });
 
 
+    it('should work with no authentication options and passing additional options', function() {
+      var sequelize = new Sequelize('mysql://example.com:9821/dbname', {});
+      var config = sequelize.config;
+
+      expect(config.username).to.not.be.ok;
+      expect(config.password).to.be.null;
+    });
+
     it('should use the default port when no other is specified', function() {
     it('should use the default port when no other is specified', function() {
       var sequelize = new Sequelize('dbname', 'root', 'pass', {
       var sequelize = new Sequelize('dbname', 'root', 'pass', {
           dialect: dialect
           dialect: dialect