summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-29 02:54:12 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-29 02:54:12 +0200
commit888c02e0c6507d1f2f3366fef93ead3fe573a448 (patch)
treeb7ca4467991824023a807ac9cfdef5ac363567fd
parent479b68b5ae842995a95a3f4fd429dab5c3f471b5 (diff)
api calls boys we're in business
-rw-r--r--app/server/db/bookshelf.js2
-rw-r--r--app/server/util/upload.js1
-rw-r--r--migrations/20180529002311_createDatasets.js1
3 files changed, 2 insertions, 2 deletions
diff --git a/app/server/db/bookshelf.js b/app/server/db/bookshelf.js
index 27d9dbb..545b574 100644
--- a/app/server/db/bookshelf.js
+++ b/app/server/db/bookshelf.js
@@ -1,3 +1,5 @@
+require('dotenv').config()
+
const knex = require('knex')({
client: 'mysql2',
connection: {
diff --git a/app/server/util/upload.js b/app/server/util/upload.js
index 0f71196..07405f9 100644
--- a/app/server/util/upload.js
+++ b/app/server/util/upload.js
@@ -1,4 +1,3 @@
-// called... twice?
require('dotenv').config()
var knox = require('knox')
diff --git a/migrations/20180529002311_createDatasets.js b/migrations/20180529002311_createDatasets.js
index 41cd457..7ac2168 100644
--- a/migrations/20180529002311_createDatasets.js
+++ b/migrations/20180529002311_createDatasets.js
@@ -6,7 +6,6 @@ exports.up = function(knex, Promise) {
table.boolean('completed')
table.boolean('processing')
table.string('status')
- table.string('status')
table.string('activity')
table.string('module')
table.string('checkpoint')