Merge pull request #1342 from h0vhannes/mssql-conn-urls

Correct connection URL parsing for MSSQL
knex · Apr 29, 2016 · 8a303f1 · 8a303f1
2 parents 9903e7d + 8e41a33
commit 8a303f1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/util/parse-connection.js b/src/util/parse-connection.js
@@ -37,7 +37,11 @@ function connectionObject(parsed) {
     connection.database = db
   }
   if (parsed.hostname) {
-    connection.host = parsed.hostname;
+    if (parsed.protocol.indexOf('mssql') === 0) {
+      connection.server = parsed.hostname;
+    } else {
+      connection.host = parsed.hostname;
+    }
   }
   if (parsed.port) {
     connection.port = parsed.port;
@@ -52,4 +56,4 @@ function connectionObject(parsed) {
     }
   }
   return connection
-}
+}
diff --git a/test/tape/parse-connection.js b/test/tape/parse-connection.js
@@ -34,6 +34,21 @@ test('parses maria connections, aliasing database to db', function(t) {
   t.deepEqual(parseConnection('mariadb://username:pass@path.to.some-url:6000/testdb'), maria)
 })
 
+test('parses mssql connections, aliasing host to server', function(t) {
+  t.plan(1)
+  var mssql = {
+    client: 'mssql',
+    connection: {
+      user: 'username',
+      password: 'pass',
+      server: 'path.to.some-url',
+      port: '6000',
+      database: 'testdb'
+    }
+  }
+  t.deepEqual(parseConnection('mssql://username:pass@path.to.some-url:6000/testdb'), mssql)
+})
+
 test('assume a path is mysql', function(t) {
   t.plan(1)
   t.deepEqual(parseConnection('/path/to/file.db'), {