X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fmigrator.ts;h=7d7c9f8cba91dadee1ee977d574a8e0c48f82d0f;hb=7196a70b28e93ede11ccbfef7f1bc919c663b964;hp=c767acc831cd174e0bbaa6bf30c6d5a337c4da49;hpb=3660d6c3c7ddacfb54d4a3bb42bc93467e7a75af;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index c767acc83..7d7c9f8cb 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,5 +1,6 @@
-import * as path from 'path'
-import { readdirPromise } from '../helpers/core-utils'
+import { readdir } from 'fs-extra'
+import { join } from 'path'
+import { QueryTypes } from 'sequelize'
 import { logger } from '../helpers/logger'
 import { LAST_MIGRATION_VERSION } from './constants'
 import { sequelizeTypescript } from './database'
@@ -11,10 +12,15 @@ async function migrate () {
   // The installer will do that
   if (tables.length === 0) return
 
-  let actualVersion: number = null
+  let actualVersion: number | null = null
 
-  const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "application"')
-  if (rows && rows[0] && rows[0].migrationVersion) {
+  const query = 'SELECT "migrationVersion" FROM "application"'
+  const options = {
+    type: QueryTypes.SELECT as QueryTypes.SELECT
+  }
+
+  const rows = await sequelizeTypescript.query<{ migrationVersion: number }>(query, options)
+  if (rows?.[0]?.migrationVersion) {
     actualVersion = rows[0].migrationVersion
   }
 
@@ -35,7 +41,7 @@ async function migrate () {
     try {
       await executeMigration(actualVersion, migrationScript)
     } catch (err) {
-      logger.error('Cannot execute migration %s.', migrationScript.version, err)
+      logger.error('Cannot execute migration %s.', migrationScript.version, { err })
       process.exit(-1)
     }
   }
@@ -52,9 +58,9 @@ export {
 // ---------------------------------------------------------------------------
 
 async function getMigrationScripts () {
-  const files = await readdirPromise(path.join(__dirname, 'migrations'))
+  const files = await readdir(join(__dirname, 'migrations'))
   const filesToMigrate: {
-    version: string,
+    version: string
     script: string
   }[] = []
 
@@ -82,7 +88,7 @@ async function executeMigration (actualVersion: number, entity: { version: strin
   const migrationScriptName = entity.script
   logger.info('Executing %s migration script.', migrationScriptName)
 
-  const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName))
+  const migrationScript = require(join(__dirname, 'migrations', migrationScriptName))
 
   return sequelizeTypescript.transaction(async t => {
     const options = {