Auto-merge for PR #445 via VersionBot

Update dependent device DB

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v4.3.2 - 2017-06-14
+
+* Update dependent device DB [Joe Roberts]
+
 ## v4.3.1 - 2017-06-13
 
 * Enable SSL when connecting to pubnub [Petros Angelatos]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

src/db.coffee

@@ -80,6 +80,9 @@ knex.init = Promise.all([
 				t.string('commit')
 				t.string('imageId')
 				t.json('config')
+				t.json('environment')
+		else
+			addColumn('dependentApp', 'environment', 'json')
 
 	knex.schema.hasTable('dependentDevice')
 	.then (exists) ->
@@ -88,6 +91,7 @@ knex.init = Promise.all([
 				t.increments('id').primary()
 				t.string('uuid')
 				t.string('appId')
+				t.string('localId')
 				t.string('device_type')
 				t.string('logs_channel')
 				t.string('deviceId')
@@ -95,6 +99,8 @@ knex.init = Promise.all([
 				t.string('name')
 				t.string('status')
 				t.string('download_progress')
+				t.string('is_managed_by')
+				t.dateTime('lock_expiry_date')
 				t.string('commit')
 				t.string('targetCommit')
 				t.json('environment')
@@ -103,7 +109,12 @@ knex.init = Promise.all([
 				t.json('targetConfig')
 				t.boolean('markedForDeletion')
 		else
-			addColumn('dependentDevice', 'markedForDeletion', 'boolean')
+			Promise.all [
+				addColumn('dependentDevice', 'markedForDeletion', 'boolean')
+				addColumn('dependentDevice', 'localId', 'string')
+				addColumn('dependentDevice', 'is_managed_by', 'string')
+				addColumn('dependentDevice', 'lock_expiry_date', 'dateTime')
+		]
 ])
 
 module.exports = knex