Update postgres connection method

Password with a reserved character can break the connection if using url
UW-Macrostrat · Aug 21, 2023 · d246a89 · d246a89
1 parent 036922b
commit d246a89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/v1/larkin.js b/v1/larkin.js
@@ -33,8 +33,13 @@ var mysql = require("mysql"),
     const nameMapping = credentials.postgresDatabases ?? {}
     const dbName = nameMapping[db] ?? db
 
-    const cfg = "postgres://" + credentials.pg.user + (credentials.pg.password.length ? ':' + credentials.pg.password : '') + "@" + credentials.pg.host + ":" + credentials.pg.port + "/" + dbName;
-    const pool = new pg.Pool({ connectionString: cfg });
+    const pool = new pg.Pool({
+      user: credentials.pg.user,
+      password: credentials.pg.password,
+      host: credentials.pg.host,
+      port: credentials.pg.port,
+      database: dbName
+    });
 
     pool.connect(function(err, client, done) {
       if (err) {

diff --git a/v2/larkin.js b/v2/larkin.js
@@ -31,8 +31,13 @@ var mysql = require("mysql"),
     const nameMapping = credentials.postgresDatabases ?? {}
     const dbName = nameMapping[db] ?? db
 
-    const cfg = "postgres://" + credentials.pg.user + (credentials.pg.password.length ? ':' + credentials.pg.password : '') + "@" + credentials.pg.host + ":" + credentials.pg.port + "/" + dbName;
-    const pool = new pg.Pool({ connectionString: cfg });
+    const pool = new pg.Pool({
+      user: credentials.pg.user,
+      password: credentials.pg.password,
+      host: credentials.pg.host,
+      port: credentials.pg.port,
+      database: dbName
+    });
 
     pool.connect(function(err, client, done) {
       if (err) {