X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Finitializers%2Fmigrations%2F0030-video-category.ts;h=f5adee8f9122ace8e67614b21316fc9e492b8e6b;hb=6fcd19ba737f1f5614a56c6925adb882dea43b8d;hp=1073f449cd554191864c2cc784de09f0dfeee00d;hpb=5fe7e898316e18369c3e1aba307b55077adc7bfb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/migrations/0030-video-category.ts b/server/initializers/migrations/0030-video-category.ts index 1073f449c..f5adee8f9 100644 --- a/server/initializers/migrations/0030-video-category.ts +++ b/server/initializers/migrations/0030-video-category.ts @@ -1,9 +1,12 @@ -import { waterfall } from 'async' - -// utils = { transaction, queryInterface, sequelize, Sequelize } -function up (utils, finalCallback) { +import * as Sequelize from 'sequelize' +import * as Promise from 'bluebird' + +function up (utils: { + transaction: Sequelize.Transaction, + queryInterface: Sequelize.QueryInterface, + sequelize: Sequelize.Sequelize +}): Promise { const q = utils.queryInterface - const Sequelize = utils.Sequelize const data = { type: Sequelize.INTEGER, @@ -11,20 +14,12 @@ function up (utils, finalCallback) { defaultValue: 0 } - waterfall([ - - function addCategoryColumn (callback) { - q.addColumn('Videos', 'category', data, { transaction: utils.transaction }).asCallback(function (err) { - return callback(err) - }) - }, - - function nullOnDefault (callback) { + return q.addColumn('Videos', 'category', data) + .then(() => { data.defaultValue = null - q.changeColumn('Videos', 'category', data, { transaction: utils.transaction }).asCallback(callback) - } - ], finalCallback) + return q.changeColumn('Videos', 'category', data) + }) } function down (options, callback) {