X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fmigrator.ts;h=7ac20127e866a0deee77d6179b0ea8c1706fb5e5;hb=6053e6f53c0975d4af5998d611f1dabef8224e41;hp=bb2539fc88e3297b8f1af44df4b7acf027b05317;hpb=91fea9fc48a4ce53dd69e0e20f5804ad95a6c27d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index bb2539fc8..7ac20127e 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,5 +1,7 @@
-import * as path from 'path'
-import { logger, readdirPromise } from '../helpers'
+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'
 
@@ -10,19 +12,16 @@ async function migrate () {
   // The installer will do that
   if (tables.length === 0) return
 
-  let actualVersion: number = null
+  let actualVersion: number | null = null
 
-  // Search in "Applications" or "application" tables
-  try {
-    const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "Applications"')
-    if (rows && rows[ 0 ] && rows[ 0 ].migrationVersion) {
-      actualVersion = rows[ 0 ].migrationVersion
-    }
-  } catch {
-    const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "application"')
-    if (rows && rows[0] && rows[0].migrationVersion) {
-      actualVersion = 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
   }
 
   if (actualVersion === null) {
@@ -42,8 +41,8 @@ async function migrate () {
     try {
       await executeMigration(actualVersion, migrationScript)
     } catch (err) {
-      logger.error('Cannot execute migration %s.', migrationScript.version, err)
-      process.exit(0)
+      logger.error('Cannot execute migration %s.', migrationScript.version, { err })
+      process.exit(-1)
     }
   }
 
@@ -59,14 +58,14 @@ 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
   }[] = []
 
   files
-    .filter(file => file.endsWith('.js.map') === false)
+    .filter(file => file.endsWith('.js'))
     .forEach(file => {
       // Filename is something like 'version-blabla.js'
       const version = file.split('-')[0]
@@ -89,9 +88,9 @@ 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))
 
-  await sequelizeTypescript.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
     const options = {
       transaction: t,
       queryInterface: sequelizeTypescript.getQueryInterface(),