make it possible to use ":" in passwords in a DSN (#334)

* make it possible to use ":" in passwords in a DSN * CS * more hacking to work around lint rules :-/
sequelize · Aug 6, 2016 · 99878bc · 99878bc
1 parent d526a8e
commit 99878bc
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/lib/tasks/db.js b/lib/tasks/db.js
@@ -302,29 +302,30 @@ function getSequelizeInstance () {
       options[key] = value;
     }
 
-    if (key === 'use_env_variable') {
-      if (process.env[value]) {
-        var dbUrl = url.parse(process.env[value]);
-        var protocol = dbUrl.protocol.split(':')[0];
+    if (key === 'use_env_variable' && process.env[value]) {
+      var dbUrl = url.parse(process.env[value]);
+      var protocol = dbUrl.protocol.split(':')[0];
 
-        config.database = dbUrl.pathname.substring(1);
+      config.database = dbUrl.pathname.substring(1);
 
-        if (protocol === 'sqlite') {
-          options.storage = dbUrl.pathname;
-        } else if (dbUrl.auth) {
-          var auth = dbUrl.auth.split(':');
+      if (protocol === 'sqlite') {
+        options.storage = dbUrl.pathname;
+      } else if (dbUrl.auth) {
+        var authParts = dbUrl.auth.split(':');
 
-          config.username = auth[0];
-          config.password = auth[1];
-        }
+        config.username = authParts[0];
 
-        options = _.assign(options, {
-          host: dbUrl.hostname,
-          port: dbUrl.port,
-          dialect: protocol,
-          protocol: protocol
-        });
+        if (authParts.length > 1) {
+          config.password = authParts.slice(1).join(':');
+        }
       }
+
+      options = _.assign(options, {
+        host: dbUrl.hostname,
+        port: dbUrl.port,
+        dialect: protocol,
+        protocol: protocol
+      });
     }
 
     if (key === 'dialectOptions') {