Merge pull request #17 from oslabs-beta/new_cleanUp

New clean up

Author: wiris316

electron/databases/mongo.ts

@@ -1,15 +1,25 @@
 import mongoose from 'mongoose';
 // import { MongoError } from 'mongodb';
+const testURL = '';
 // Mongoose connection wrapped in function that takes the index of the selected database as the parameter. This index is used to target the correct database for querying.
 const connectMongoose = async (i:number, URI: string) => {
   try {
     await mongoose.connection.close();
-    const db = await mongoose.connect(URI);
-
+    const db = await mongoose.connect(URI)
     return db;
   } catch (err) {
     console.log(`${__dirname}/mongo.ts/connectMongoose: ${err}`);
   }
 };
 
+// const connectMongoose = async (i: number, URI: string) => {
+//   try {
+//     const db2 = mongoose.createConnection(testURL);
+//     console.log('connection to user provided db established..');
+//     return db2;
+//   } catch (error) {
+//     console.log('Error connecting to second db... ', error);
+//   }
+// }
+
 export default connectMongoose;

electron/databases/postgres.ts

@@ -1,9 +1,18 @@
 import { Pool } from 'pg';
 // SQL connection wrapped in function that takes the index of the selected database as the parameter. This index is used to target the correct database for querying.
-const connectSQL = (i: number, URI: string) => {
-  return new Pool({
-    connectionString: URI,
-  });
+const connectSQL = async (i: number, URI: string) => {
+  try {
+    const pool= new Pool({
+      connectionString: URI,
+    })
+    const client = await pool.connect();
+    client.release()
+    console.log('connected to sql')
+    return pool; 
+  } catch (err) {
+    console.log('Error connecting to SQL')
+    return null;
+   }
 };
 
 export default connectSQL;