testing elevation endpoint on dev

UW-Macrostrat · Sep 9, 2024 · aea3843 · aea3843
1 parent 0fb9740
commit aea3843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/v2/credentials.ts b/v2/credentials.ts
@@ -7,13 +7,6 @@ exports.pg = {
   database: process.env.database
 };
 
-exports.elevationDatabase = {
-  host: process.env.host,
-  port: process.env.port,
-  user: process.env.user,
-  password: process.env.password,
-  database: process.env.database
-};
 
 
 

diff --git a/v2/larkin.ts b/v2/larkin.ts
@@ -81,15 +81,14 @@ const { Client, Pool } = require("pg");
         "In Macrostrat v2, 'geomacro' is merged with 'burwell' into the 'macrostrat' database.",
       );
     }
+    let connectionDetails = credentials.pg;
 
     if (dbName == "elevation") {
       /* Special case for elevation database (temporary) */
-      let { connectionString, ...otherConnectionDetails } = credentials.elevationDatabase;
-    } else {
-        let { connectionString, ...otherConnectionDetails } = credentials.pg;
+      connectionDetails.database = 'elevation'
     }
-
-    const pool = new Pool({ connectionString, ...otherConnectionDetails });
+    console.log(connectionDetails)
+    const pool = new Pool(connectionDetails);
 
     pool.connect(function (err, client, done) {
       if (err) {