fix migration so it doesn't error out on existing devices

migrations/1509439657189-add_machine_name_to_devices.js

@@ -1,12 +1,20 @@
 const db = require('./db')
+const migrateTools = require('./migrate-tools')
 
 exports.up = function (next) {
-  const sql = [
-    'alter table devices add column name text not null'
-  ]
-  db.multi(sql, next)
+  return migrateTools.migrateNames()
+  .then(updateSql => {
+    const sql = [
+      'alter table devices add column name text',
+      updateSql,
+      'alter table devices alter column name set not null'
+    ]
+
+    return db.multi(sql, next)
+  })
 }
 
 exports.down = function (next) {
-  next()
+  const sql = ['alter table devices drop column name']
+  db.multi(sql, next)
 }