connects dbConnection and db_build.js to build the database

Relates #1

config.env

@@ -0,0 +1 @@
+EMO_DB_URL = postgres://emoadmin:adminemo@localhost:5432/emotions

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "test": "nyc tape ./test/*.js | tap-spec",
     "coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "start": "nodemon server.js"
+    "start": "nodemon server.js",
+    "build-db": "node src/db/db_build.js"
   },
   "repository": {
     "type": "git",
@@ -39,4 +40,4 @@
     "pg": "^7.4.3",
     "pg-promise": "^8.4.6"
   }
-}
+}

src/db/dbConnection.js

@@ -0,0 +1,37 @@
+const pgp = require('pg-promise')();
+// require('env2')('./config.env');
+
+const herokuDB = {
+  host: process.env.HEROKU_HOST,
+  user: process.env.HEROKU_USER,
+  password: process.env.HEROKU_PW,
+  database: process.env.HEROKU_DB,
+  ssl: true,
+};
+
+const localDB = {
+  host: 'localhost',
+  port: 5432,
+  database: 'emotions',
+  user: 'emoadmin',
+  password: 'adminemo'
+};
+
+// const testDB = {
+//   host: 'localhost',
+//   port: 5432,
+//   database: 'emotions',
+//   user: 'emoadmin',
+//   password: 'adminemo'
+// };
+
+// let DB_URL = process.env.EMO_DB_URL;
+
+// if (!DB_URL) {
+//   throw new Error('Environmental variable DB_URL needs to be set');
+// }
+
+const connection = process.env.NODE_ENV === 'production' ? herokuDB : localDB;
+
+const db = pgp(connection);
+module.exports = db;

src/db/db_build.js

@@ -1,10 +1,10 @@
-const { queryfile } = require('pg-promise');
+const { QueryFile } = require('pg-promise');
 const path = require('path');
-const db = require('./db_connection');
+const db = require('./dbConnection');
 
-const sql = file => queryfile(path.join(__dirname, file) /*, {minify: true}*/);
+const sql = file => QueryFile(path.join(__dirname, file)/*, { minify: true }*/);
 
-const build = sql('./build.sql');
+const build = sql('./db_build.sql');
 
 db.query(build)
   .then(res => console.log('db built, res = ', res))

src/db/db_build.sql

@@ -16,7 +16,7 @@ CREATE TABLE scores (
   score FLOAT(4) NOT NULL, -- should give about 7 decimal places (4-bytes worth)
   emotion VARCHAR(20),
   img VARCHAR(100)
-)
+);
 
 INSERT INTO users (name,email,pw_hash) VALUES
 ('Nicolas Cage', '[email protected]', 'placeholder'),