Merge pull request sailshq#5 from treelinehq/allow-url-without-protocol

Allow any protocol, or no protocol at all.

Author: particlebanana

machines/create-manager.js

@@ -211,13 +211,14 @@ module.exports = {
     //
     // Remember: connection string takes priority over `meta` in the event of a conflict.
     try {
-      var parsedConnectionStr = Url.parse(inputs.connectionString);
-
-      // Validate that a protocol was found before other pieces
-      // (otherwise other parsed info will be very weird and wrong)
-      if (!parsedConnectionStr.protocol || parsedConnectionStr.protocol !== 'mysql:') {
-        throw new Error('Protocol (i.e. `mysql://`) is required in connection string.');
+      var urlToParse = inputs.connectionString;
+      // We don't actually care about the protocol, but `url.parse()` returns funky results
+      // if the argument doesn't have one.  So we'll add one if necessary.
+      // See https://en.wikipedia.org/wiki/Uniform_Resource_Identifier#Syntax
+      if (!urlToParse.match(/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//)) {
+        urlToParse = 'mysql://' + urlToParse;
       }
+      var parsedConnectionStr = Url.parse(urlToParse);
 
       // Parse port & host
       var DEFAULT_HOST = 'localhost';

test/connectable/create-manager.js

@@ -3,14 +3,14 @@ var Pack = require('../../');
 
 describe('Connectable ::', function() {
   describe('Create Manager', function() {
-    it('should validate the connection string has a protocol', function(done) {
+    it('should work without a protocol in the connection string', function(done) {
       Pack.createManager({
         connectionString: 'localhost:5432/mppg'
       })
       .exec(function(err) {
-        assert(err);
-        assert.equal(err.exit, 'malformed');
-
+        if (err) {
+          return done(err);
+        }
         return done();
       });
     });