made a few changes to get api to deploy

UW-Macrostrat · Sep 25, 2024 · e52a592 · e52a592
1 parent 58014c4
commit e52a592
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/v2/credentials.ts b/v2/credentials.ts
@@ -11,15 +11,17 @@ if (process.env.MACROSTRAT_DATABASE != null) {
     macrostratDatabaseURL,
     elevationDatabaseURL
   };
-} else {
+}
+//added exports.pg to https://github.com/UW-Macrostrat/tiger-macrostrat-config/blob/main/manifests/development/dev-web-stack/credentials.js
+else {
   console.warn("Using deprecated database configuration, please migrate to the MACROSTRAT_DATABASE=<url> format");
-  exports.pg = {
-    host: process.env.host,
-    port: process.env.port,
-    user: process.env.user,
-    password: process.env.password,
-    database: process.env.database
-  };
+exports.pg = {
+  host: process.env.host,
+  port: process.env.port,
+  user: process.env.user,
+  password: process.env.password,
+  database: 'macrostrat'
+};
 }
 
 

diff --git a/v2/larkin.ts b/v2/larkin.ts
@@ -82,9 +82,7 @@ const { Client, Pool } = require("pg");
     }
 
     let connectionDetails;
-
     const postgresCfg = credentials.pg;
-    console.log(postgresCfg.elevationDatabaseURL)
 
     const inURLMode = postgresCfg.macrostratDatabaseURL != null;
     if (inURLMode) {
@@ -95,7 +93,7 @@ const { Client, Pool } = require("pg");
       connectionDetails = { connectionString }
 
     } else {
-      connectionDetails = {...credentials.pg}
+      connectionDetails = { ...credentials.pg }
       if (dbName == "elevation") {
         /* Special case for elevation database (temporary) */
         connectionDetails.database = 'elevation'