X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fmigrations%2F0005-email-pod.ts;h=c34a122559898c25f8da2b3cd5f1b6322f2d822a;hb=e69219184b1a3262ec5e617d30337b6431c9840c;hp=a9200c47f3b14cc30e602099e1989a625a2f7595;hpb=65fcc3119c334b75dd13bcfdebf186afdc580a8f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/migrations/0005-email-pod.ts b/server/initializers/migrations/0005-email-pod.ts
index a9200c47f..c34a12255 100644
--- a/server/initializers/migrations/0005-email-pod.ts
+++ b/server/initializers/migrations/0005-email-pod.ts
@@ -1,40 +1,33 @@
-import { waterfall } from 'async'
-
-// utils = { transaction, queryInterface, sequelize, Sequelize }
-function up (utils, finalCallback) {
+import * as Sequelize from 'sequelize'
+import * as Promise from 'bluebird'
+import { Migration } from '../../models/migrations'
+
+function up (utils: {
+  transaction: Sequelize.Transaction,
+  queryInterface: Sequelize.QueryInterface,
+  sequelize: Sequelize.Sequelize
+}): Promise<void> {
   const q = utils.queryInterface
-  const Sequelize = utils.Sequelize
 
   const data = {
     type: Sequelize.STRING(400),
     allowNull: false,
     defaultValue: ''
-  }
-
-  waterfall([
+  } as Migration.String
 
-    function addEmailColumn (callback) {
-      q.addColumn('Pods', 'email', data, { transaction: utils.transaction }).asCallback(function (err) {
-        return callback(err)
-      })
-    },
-
-    function updateWithFakeEmails (callback) {
+  return q.addColumn('Pods', 'email', data)
+    .then(() => {
       const query = 'UPDATE "Pods" SET "email" = \'dummy@example.com\''
-      utils.sequelize.query(query, { transaction: utils.transaction }).asCallback(function (err) {
-        return callback(err)
-      })
-    },
-
-    function nullOnDefault (callback) {
+      return utils.sequelize.query(query, { transaction: utils.transaction })
+    })
+    .then(() => {
       data.defaultValue = null
 
-      q.changeColumn('Pods', 'email', data, { transaction: utils.transaction }).asCallback(callback)
-    }
-  ], finalCallback)
+      return q.changeColumn('Pods', 'email', data)
+    })
 }
 
-function down (options, callback) {
+function down (options) {
   throw new Error('Not implemented.')
 }