require -> import

[oweals/peertube.git] / server / initializers / migrator.ts

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index cfa3220e073a8d3a4d4a149afe30dc66804d1d7a..379d43af528f0e16456dd9e8c7a635870620dadf 100644 (file)
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,10 +1,12 @@
 import { waterfall, eachSeries } from 'async'
-import fs = require('fs')
-import path = require('path')
+import * as fs from 'fs'
+import * as path from 'path'
+import * as Sequelize from 'sequelize'
 
-const db = require('./database')
+import { database as db } from './database'
 import { LAST_MIGRATION_VERSION } from './constants'
 import { logger } from '../helpers'
+import { ApplicationInstance } from '../models'
 
 function migrate (finalCallback) {
   waterfall([
@@ -94,7 +96,7 @@ function getMigrationScripts (callback) {
 }
 
 function executeMigration (actualVersion, entity, callback) {
-  const versionScript = parseInt(entity.version)
+  const versionScript = parseInt(entity.version, 10)
 
   // Do not execute old migration scripts
   if (versionScript <= actualVersion) return callback(null)
@@ -112,7 +114,7 @@ function executeMigration (actualVersion, entity, callback) {
       transaction: t,
       queryInterface: db.sequelize.getQueryInterface(),
       sequelize: db.sequelize,
-      Sequelize: db.Sequelize
+      Sequelize: Sequelize
     }
     migrationScript.up(options, function (err) {
       if (err) {