server recognizes db, read/write is up

server/db/index.ts

@@ -1,8 +1,6 @@
-import createConnectionPool, { sql } from "@databases/pg";
+import { Pool } from 'pg';
 import dotenv from 'dotenv';
-dotenv.config({ path: '../.env' });
+dotenv.config();
 
-const db = createConnectionPool(process.env.CONSTRING);
-
-export { sql };
-export default db;
+const pool = new Pool({ connectionString: process.env.CONSTRING });
+export default pool;

server/db/seed.ts

@@ -9,10 +9,10 @@ dotenv.config();
     `
 
     const appusers = `
-        CREATE TABLE IF NOT EXISTS recipin.app_users (
+        CREATE TABLE IF NOT EXISTS recipin.appusers (
             id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-            first_name varchar NOT NULL,
-            last_name varchar NOT NULL,
+            firstname varchar NOT NULL,
+            lastname varchar NOT NULL,
             handle varchar NOT NULL,
             email varchar NOT NULL,
             password varchar NOT NULL
@@ -31,7 +31,7 @@ dotenv.config();
         CREATE TABLE IF NOT EXISTS recipin.collection (
             id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
             name varchar NOT NULL,
-            owner_id int REFERENCES recipin.app_users (id)
+            ownerid int REFERENCES recipin.appusers (id)
         );
     `
 
@@ -41,9 +41,9 @@ dotenv.config();
             name varchar NOT NULL,
             description varchar,
             preptime varchar,
-            date_created varchar,
-            date_modified varchar,
-            author_user_id int REFERENCES recipin.app_users (id) NOT NULL
+            datecreated varchar,
+            datemodified varchar,
+            authoruserid int REFERENCES recipin.appusers (id) NOT NULL
         );
     `
 
@@ -52,17 +52,17 @@ dotenv.config();
             recipe_ingredient_id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
             quantity decimal,
             unit varchar,
-            ingredient_id int REFERENCES recipin.ingredient (id),
-            recipe_id int REFERENCES recipin.recipe (id),
-            collection_id int REFERENCES recipin.collection (id)
+            ingredientid int REFERENCES recipin.ingredient (id),
+            recipeid int REFERENCES recipin.recipe (id),
+            collectionid int REFERENCES recipin.collection (id)
         );
     `
 
     const userscollections = `        
         CREATE TABLE IF NOT EXISTS recipin.cmp_users_collections (
-            users_collections_id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-            collection_id int REFERENCES recipin.collection (id),
-            user_member_id int REFERENCES recipin.app_users (id)
+            userscollectionsid INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+            collectionid int REFERENCES recipin.collection (id),
+            usermemberid int REFERENCES recipin.appusers (id)
         );
     `;
 
@@ -80,6 +80,7 @@ dotenv.config();
 
         await client.end();
     } catch(e: any) {
+        await client.end();
         throw new Error(e);
     }