X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fapplication.js;h=46dcfde33bf88fb3103db5b0ef80709ed1e1c8e4;hb=55fa55a9be566cca2ba95322f2ae23b434aed62a;hp=ec1d7b1227c70bf1ce8f3254a2e59e16afc699d6;hpb=feb4bdfd9b46e87aadfa7c0d5338cde887d1f58c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/models/application.js b/server/models/application.js
index ec1d7b122..46dcfde33 100644
--- a/server/models/application.js
+++ b/server/models/application.js
@@ -1,15 +1,21 @@
+'use strict'
+
 module.exports = function (sequelize, DataTypes) {
   const Application = sequelize.define('Application',
     {
-      sqlSchemaVersion: {
+      migrationVersion: {
         type: DataTypes.INTEGER,
-        defaultValue: 0
+        defaultValue: 0,
+        allowNull: false,
+        validate: {
+          isInt: true
+        }
       }
     },
     {
       classMethods: {
-        loadSqlSchemaVersion,
-        updateSqlSchemaVersion
+        loadMigrationVersion,
+        updateMigrationVersion
       }
     }
   )
@@ -19,18 +25,28 @@ module.exports = function (sequelize, DataTypes) {
 
 // ---------------------------------------------------------------------------
 
-function loadSqlSchemaVersion (callback) {
+function loadMigrationVersion (callback) {
   const query = {
-    attributes: [ 'sqlSchemaVersion' ]
+    attributes: [ 'migrationVersion' ]
   }
 
   return this.findOne(query).asCallback(function (err, data) {
-    const version = data ? data.sqlSchemaVersion : 0
+    const version = data ? data.migrationVersion : 0
 
     return callback(err, version)
   })
 }
 
-function updateSqlSchemaVersion (newVersion, callback) {
-  return this.update({ sqlSchemaVersion: newVersion }).asCallback(callback)
+function updateMigrationVersion (newVersion, transaction, callback) {
+  const options = {
+    where: {}
+  }
+
+  if (!callback) {
+    transaction = callback
+  } else {
+    options.transaction = transaction
+  }
+
+  return this.update({ migrationVersion: newVersion }, options).asCallback(callback)
 }