Update migrations code

2 files changed, 24 insertions, 9 deletions

diff --git a/server/models/application.js b/server/models/application.js
index ec1d7b122..4114ed76d 100644
--- a/server/models/application.js
+++ b/server/models/application.js
@@ -1,15 +1,15 @@
 module.exports = function (sequelize, DataTypes) {
   const Application = sequelize.define('Application',
     {
-      sqlSchemaVersion: {
+      migrationVersion: {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
     },
     {
       classMethods: {
-        loadSqlSchemaVersion,
-        updateSqlSchemaVersion
+        loadMigrationVersion,
+        updateMigrationVersion
       }
     }
   )
@@ -19,18 +19,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)
 }
diff --git a/server/models/video.js b/server/models/video.js
index 0023a24e1..af05a861f 100644
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -16,7 +16,7 @@ const modelUtils = require('./utils')
 // ---------------------------------------------------------------------------
 
 module.exports = function (sequelize, DataTypes) {
-// TODO: add indexes on searchable columns
+  // TODO: add indexes on searchable columns
   const Video = sequelize.define('Video',
     {
       id: {
@@ -50,6 +50,7 @@ module.exports = function (sequelize, DataTypes) {
 
         generateThumbnailFromBase64,
         getDurationFromFile,
+        list,
         listForApi,
         listByHostAndRemoteId,
         listOwnedAndPopulateAuthorAndTags,
@@ -310,6 +311,10 @@ function getDurationFromFile (videoPath, callback) {
   })
 }
 
+function list (callback) {
+  return this.find().asCallback()
+}
+
 function listForApi (start, count, sort, callback) {
   const query = {
     offset: start,