Add configuration for prometheus exporter hostname

[github/Chocobozzz/PeerTube.git] / server / initializers / migrator.ts

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index adc2f9fb370ddd9f15ddbd4838a2b5d6be6cac13..7ac20127e866a0deee77d6179b0ea8c1706fb5e5 100644 (file)
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,8 +1,9 @@
-import * as path from 'path'
+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'
-import { readdir } from 'fs-extra'
 
 async function migrate () {
   const tables = await sequelizeTypescript.getQueryInterface().showAllTables()
@@ -13,8 +14,13 @@ async function migrate () {
 
   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
   }
 
@@ -52,14 +58,14 @@ export {
 // ---------------------------------------------------------------------------
 
 async function getMigrationScripts () {
-  const files = await readdir(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]
@@ -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 = {