X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Fmigrator.ts;h=539e2bc8fbaeb17a6ba52af3334db7296086fb6e;hb=040467f5c8cba429176423d5e4b83bf5379ad101;hp=187c9be6e5bb3abb305a886434826d2fadb02425;hpb=74bb2cb8348d6794ed3a0e2ec94c8c9abdde82cf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/migrator.ts b/server/initializers/migrator.ts
index 187c9be6e..539e2bc8f 100644
--- a/server/initializers/migrator.ts
+++ b/server/initializers/migrator.ts
@@ -1,19 +1,25 @@
 import * as path from 'path'
-
-import { database as db } from './database'
+import { readdirPromise } from '../helpers/core-utils'
+import { logger } from '../helpers/logger'
 import { LAST_MIGRATION_VERSION } from './constants'
-import { logger, readdirPromise } from '../helpers'
+import { sequelizeTypescript } from './database'
 
 async function migrate () {
-  const tables = await db.sequelize.getQueryInterface().showAllTables()
+  const tables = await sequelizeTypescript.getQueryInterface().showAllTables()
 
   // No tables, we don't need to migrate anything
   // The installer will do that
   if (tables.length === 0) return
 
-  let actualVersion = await db.Application.loadMigrationVersion()
+  let actualVersion: number | null = null
+
+  const [ rows ] = await sequelizeTypescript.query('SELECT "migrationVersion" FROM "application"')
+  if (rows && rows[0] && rows[0].migrationVersion) {
+    actualVersion = rows[0].migrationVersion
+  }
+
   if (actualVersion === null) {
-    await db.Application.create({ migrationVersion: 0 })
+    await sequelizeTypescript.query('INSERT INTO "application" ("migrationVersion") VALUES (0)')
     actualVersion = 0
   }
 
@@ -29,8 +35,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)
     }
   }
 
@@ -78,17 +84,16 @@ async function executeMigration (actualVersion: number, entity: { version: strin
 
   const migrationScript = require(path.join(__dirname, 'migrations', migrationScriptName))
 
-  await db.sequelize.transaction(async t => {
+  return sequelizeTypescript.transaction(async t => {
     const options = {
       transaction: t,
-      queryInterface: db.sequelize.getQueryInterface(),
-      sequelize: db.sequelize,
-      db
+      queryInterface: sequelizeTypescript.getQueryInterface(),
+      sequelize: sequelizeTypescript
     }
 
     await migrationScript.up(options)
 
     // Update the new migration version
-    await db.Application.updateMigrationVersion(versionScript, t)
+    await sequelizeTypescript.query('UPDATE "application" SET "migrationVersion" = ' + versionScript, { transaction: t })
   })
 }