fixup! Add support of PostgreSQL 10 features of connection string with multiple hosts

Author: qfox

lib/connection-parameters.js

@@ -54,49 +54,43 @@ var ConnectionParameters = function (config) {
   // if the config has a connectionString defined, parse IT into the config we use
   // this will override other default values with what is stored in connectionString
   if (config.connectionString) {
-    // a unix socket connection string starts from '/' or 'socket:'
-    if (config.connectionString.indexOf('/') === 0 || config.connectionString.indexOf('socket:') === 0) {
-      config = Object.assign({ isDomainSocket: true }, config, pgparse(config.connectionString))
-    // connection uri
-    } else {
-      config = Object.assign({}, config, parse(config.connectionString))
-
-      // mimicrate connection-string object to postgrsql compatible
-      // convert path to database name
-      if (Array.isArray(config.path)) {
-        config.database = config.path[0]
-      }
-
-      // convert hosts list to host and port
-      if (Array.isArray(config.hosts)) {
-        config.host = config.hosts.map(function (host) {
-          return host.name
-        })
-        // take first port in hosts list
-        config.port = config.hosts[0].port
-      }
-
-      // convert params to separeted options
-      if (config.params && typeof config.params === 'object') {
-        Object.keys(config.params).forEach(function (key) {
-          var val = config.params[key]
-
-          switch (val) {
-            case 'true':
-              val = true
-              break
-            case 'false':
-              val = false
-              break
-            default:
-              var intVal = parseInt(val)
-              if (!isNaN(intVal)) {
-                val = intVal
-              }
-          }
-          config[key] = val
-        })
-      }
+    config = Object.assign({}, config, parse(config.connectionString))
+
+    // mimicrate connection-string object to postgrsql compatible
+    // convert path to database name
+    if (Array.isArray(config.path)) {
+      config.database = config.path[0]
+    }
+
+    // convert hosts list to host and port
+    if (Array.isArray(config.hosts)) {
+      config.host = config.hosts.map(function (host) {
+        return host.name
+      })
+      // take first port in hosts list
+      config.port = config.hosts[0].port
+    }
+
+    // convert params to separeted options
+    if (config.params && typeof config.params === 'object') {
+      Object.keys(config.params).forEach(function (key) {
+        var val = config.params[key]
+
+        switch (val) {
+          case 'true':
+            val = true
+            break
+          case 'false':
+            val = false
+            break
+          default:
+            var intVal = parseInt(val)
+            if (!isNaN(intVal)) {
+              val = intVal
+            }
+        }
+        config[key] = val
+      })
     }
   }