overhaul seeds and migrate

ref #10

.travis.yml

@@ -1,7 +1,5 @@
 sudo: required
 
-langauge: python
-
 services: 
   - docker
 

Dockerfile

@@ -12,5 +12,5 @@ RUN apt-get update \
                            libspatialite-dev \
 
 # -- specific node version -- #
-RUN curl -sL https://deb.nodesource.com/setup_8.x \
+RUN curl -sL https://deb.nodesource.com/setup_10.x \
     && apt-get install nodejs

config.js

@@ -2,9 +2,9 @@
 
 module.exports = {
     test: {
-        db: ':memory:'
+        db: './db/test-posm-paths.sqlite3'
     },
-    development: {
-        db: './db/posm-paths.sql'
+    develop: {
+        db: './db/posm-paths.sqlite3'
     }
 }

db/index.js

@@ -8,7 +8,7 @@ class Database {
     constructor() {
         if (!Database.instance) {
             this._spatialite = process.env.SPATIALITE_LOCATION;
-            this._dbLoc = config[process.env.ENVIRONMENT].db;
+            this._dbLoc = config[process.env.ENVIRONMENT || 'develop'].db;
         }
         return Database.instance
     };

db/migrations/.migrate

@@ -0,0 +1,17 @@
+{
+  "lastRun": "1533377102405-add-images.js",
+  "migrations": [
+    {
+      "title": "1533377087768-add-users.js",
+      "timestamp": 1533418332304
+    },
+    {
+      "title": "1533377095426-add-sequences.js",
+      "timestamp": 1533418332325
+    },
+    {
+      "title": "1533377102405-add-images.js",
+      "timestamp": 1533418332609
+    }
+  ]
+}

migrations/1533377087768-add-users.js → db/migrations/1533377087768-add-users.js

@@ -2,10 +2,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const upSQL = fs.readFileSync(path.join(__dirname, '1533377087768-add-users-up.sql')).toString();
-const downSQL = fs.readFileSync(path.join(__dirname, '1533377087768-add-users-down.sql')).toString();
-const dbLoc = require('../config')[process.env.ENVIRONMENT || 'develop'].db;
-const Database = require('../db');
+const upSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377087768-add-users-up.sql')).toString();
+const downSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377087768-add-users-down.sql')).toString();
+
+const dbLoc = require('../../config')[process.env.ENVIRONMENT || 'develop'].db;
+const Database = require('../');
 Database.connect(dbLoc);
 
 module.exports.up = function (next) {

migrations/1533377095426-add-sequences.js → db/migrations/1533377095426-add-sequences.js

@@ -2,11 +2,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const upSQL = fs.readFileSync(path.join(__dirname, '1533377095426-add-sequences-up.sql')).toString();
-const downSQL = fs.readFileSync(path.join(__dirname, '1533377095426-add-sequences-down.sql')).toString();
+const upSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377095426-add-sequences-up.sql')).toString();
+const downSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377095426-add-sequences-down.sql')).toString();
 
-const dbLoc = require('../config')[process.env.ENVIRONMENT || 'develop'].db;
-const Database = require('../db');
+const dbLoc = require('../../config')[process.env.ENVIRONMENT || 'develop'].db;
+const Database = require('../');
 Database.connect(dbLoc);
 
 module.exports.up = function (next) {

db/migrations/1533377102405-add-images.js

@@ -0,0 +1,22 @@
+'use strict'
+
+const fs = require('fs');
+const path = require('path');
+const upSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377102405-add-images-up.sql')).toString();
+const downSQL = fs.readFileSync(path.join(__dirname, '..', 'sql', '1533377102405-add-images-down.sql')).toString();
+
+const dbLoc = require('../../config')[process.env.ENVIRONMENT || 'develop'].db;
+const Database = require('../');
+Database.connect(dbLoc);
+
+module.exports.up = function (next) {
+  Database.executeSpatial(upSQL)
+  .then(() => next())
+  .catch(error => { console.error(error); next(); })
+}
+
+module.exports.down = function (next) {
+  Database.executeSpatial(downSQL)
+  .then(() => next())
+  .catch(error => { console.error(error); next(); });
+}

db/seeds/index.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const users = require('../../testData/seeds').users;
+const uuidv4 = require('uuid/v4');
+const dbLoc = require('../../config')[process.env.ENVIRONMENT || 'develop'].db;
+const Database = require('../');
+
+Database.connect(dbLoc);
+
+let seeds = [
+    { 
+        users: () => {
+            const values =  users.map(user => `('${uuidv4()}', '${user.name}')`).join(',');
+            const sql = `INSERT INTO Users VALUES ${values};`;
+            return Database.execute(sql)
+                .catch((err) => { throw err; });
+        }
+    }
+];
+
+if (process.argv.slice(2).length > 0) {
+    seeds = seeds.filter(s => process.argv.includes(Object.keys(s)[0]));
+}
+
+seeds.forEach(s => Object.values(s)[0]());
+

db/sql/1533377087768-add-users-down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS Users;

migrations/1533377087768-add-users-up.sql → db/sql/1533377087768-add-users-up.sql

@@ -1,4 +1,4 @@
-CREATE TABLE Users (
+CREATE TABLE IF NOT EXISTS Users(
     id UUID PRIMARY KEY,
     name TEXT NOT NULL
 );

db/sql/1533377095426-add-sequences-down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS Sequences;

migrations/1533377087768-add-sequences-up.sql → db/sql/1533377095426-add-sequences-up.sql

@@ -1,4 +1,4 @@
-CREATE TABLE Sequences(
+CREATE TABLE IF NOT EXISTS Sequences(
     id UUID NOT NULL PRIMARY KEY,
     userId UUID NOT NULL,
     images JSON1 NOT NULL,

db/sql/1533377102405-add-images-down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS Images;

migrations/1533377087768-add-images-up.sql → db/sql/1533377102405-add-images-up.sql

@@ -1,4 +1,6 @@
-CREATE TABLE Images(
+SELECT InitSpatialMetaData(1);
+
+CREATE TABLE IF NOT EXISTS Images(
     id UUID NOT NULL PRIMARY KEY,
     path TEXT NOT NULL,
     time TEXT NOT NULL,
@@ -9,7 +11,5 @@ CREATE TABLE Images(
     FOREIGN KEY(seqId) REFERENCES Sequences(id)
 );
 
---- SpatialLite for image locations ---
-SELECT AddGeometryColumn(
-    'Images', 'loc', 4326, 'POINT', 'XY'
-);
+-- SpatialLite for image locations ---
+SELECT AddGeometryColumn('Images', 'loc', 4326, 'POINT', 'XY');

package.json

@@ -7,7 +7,10 @@
   "license": "MIT",
   "scripts": {
     "test": "./node_modules/.bin/mocha test/**/* --exit",
-    "seed": "knex seed:run"
+    "migrate:up": "migrate up --state-file db/migrations/.migrate --migrations-dir db/migrations",
+    "migrate:down": "migrate down --state-file db/migrations/.migrate --migrations-dir db/migrations",
+    "seed": "node db/seeds/index.js",
+    "migrate:up:seed": "npm run migrate:up && npm run seed"
   },
   "dependencies": {
     "bluebird": "^3.5.1",

test/db.js

@@ -73,6 +73,6 @@ describe('db', () => {
             Database
                 .executeSpatial(badSql)
                 .catch((err) => expect(err).to.be.instanceof(Error));
-        })
+        });
     });
 });

test/migrations.js

@@ -1,22 +1,22 @@
 'use strict';
 
-const expect = require('chai').expect;
-const migrate = require('migrate');
+Promise = require('bluebird');
 
+const expect = require('chai').expect;
+const migrate = Promise.promisifyAll(require('migrate'));
 const path = require('path');
-const migrationsPath = path.join(process.cwd(), 'migrations');
+const migrationsPath = path.join(__dirname, '..', 'db', 'migrations');
 const migrationStore = path.join(migrationsPath, '.migrate');
-const migrationOpts = { migrationsDirectory: migrationsPath, stateStore: migrationStore };
+const migrationOpts = { migrationsDirectory: migrationsPath,  stateStore: migrationStore };
 
 describe('migrations', () => {
     it('migrates db up and back down', () => {
-        migrate.load(migrationOpts, (err, set) => {
-            if (err) throw err
-            console.log(set);
-            set.up((err, res) => {
-                if (err) throw err;
-                set.down((err, res) => { if (err) throw err; })
-            });
-        });
+        migrate.loadAsync(migrationOpts)
+            .then((set) => { 
+                set = Promise.promisifyAll(set);
+                set.upAsync().then(() => set.downAsync())
+            })
+            .catch((err) => console.error(err));
     });
-}); 
+});
+