From 86ea344525cfa1931dd16522fdf6cd053eec4523 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Mon, 10 Sep 2018 09:36:39 -0700
Subject: [PATCH] Switch Events to a lower-case table name since postgresql is
 weird with casing

---
 .sequelizerc                              | 4 ++--
 Makefile                                  | 7 +++++--
 docker-compose.yml                        | 2 --
 migrations/20180910012924-create-event.js | 4 ++--
 src/models/event.ts                       | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.sequelizerc b/.sequelizerc
index e4c4ffd..c465180 100644
--- a/.sequelizerc
+++ b/.sequelizerc
@@ -1,8 +1,8 @@
 const path = require('path')
 
 module.exports = {
-  'config':          path.resolve('config', 'database.js'),
-  'models-path': path.resolve('src', 'models')
+  'config'      : path.resolve('config', 'database.js'),
+  'models-path' : path.resolve('src', 'models')
 }
 
 // vim: ft=javascript
diff --git a/Makefile b/Makefile
index b58343c..b8761b2 100644
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,15 @@ clean:
 debug-jest:
 	node --inspect-brk=0.0.0.0:9229 ./node_modules/.bin/jest
 
+debug-db:
+	$(COMPOSE) run --rm db psql -h db -U postgres uplink_development
+
 migrate: depends
 	$(COMPOSE) up -d db
 	@echo ">> waiting a bit to make sure the database comes online.."
 	@sleep 5
-	$(COMPOSE) run --rm -e NODE_ENV=development node \
-		/usr/local/bin/node node_modules/.bin/sequelize db:migrate
+	$(COMPOSE) run --rm node \
+		/usr/local/bin/node ./node_modules/.bin/sequelize db:migrate
 
 watch:
 	jest --watchAll
diff --git a/docker-compose.yml b/docker-compose.yml
index b4197b0..c32411d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,6 @@ services:
       # Used for psql non-interactive scripting
       - 'PGPASSWORD=jenkinsuplink'
       - 'POSTGRES_DB=uplink_development'
-    ports:
-      - '5432:5432'
 
   node:
     image: node:10-alpine
diff --git a/migrations/20180910012924-create-event.js b/migrations/20180910012924-create-event.js
index d319fb0..7c8706c 100644
--- a/migrations/20180910012924-create-event.js
+++ b/migrations/20180910012924-create-event.js
@@ -1,7 +1,7 @@
 'use strict';
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    return queryInterface.createTable('Events', {
+    return queryInterface.createTable('events', {
       id: {
         allowNull: false,
         autoIncrement: true,
@@ -29,6 +29,6 @@ module.exports = {
     });
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('Events');
+    return queryInterface.dropTable('events');
   }
 };
diff --git a/src/models/event.ts b/src/models/event.ts
index c87bf59..9312c73 100644
--- a/src/models/event.ts
+++ b/src/models/event.ts
@@ -1,7 +1,7 @@
 'use strict';
 
 export default (sequelize, DataTypes) => {
-  const Event = sequelize.define('Event', {
+  const Event = sequelize.define('events', {
     type: DataTypes.STRING,
     payload: DataTypes.JSON
   }, {});