From b49f22d8f9a52ab75fd38db2d377249eb58fa678 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Dec 2020 14:30:29 +0100
Subject: Upgrade sequelize to v6

---
 server/initializers/migrations/0005-email-pod.ts              | 1 -
 server/initializers/migrations/0010-email-user.ts             | 1 -
 server/initializers/migrations/0015-video-views.ts            | 1 -
 server/initializers/migrations/0020-video-likes.ts            | 1 -
 server/initializers/migrations/0025-video-dislikes.ts         | 1 -
 server/initializers/migrations/0030-video-category.ts         | 1 -
 server/initializers/migrations/0035-video-licence.ts          | 1 -
 server/initializers/migrations/0040-video-nsfw.ts             | 1 -
 server/initializers/migrations/0045-user-display-nsfw.ts      | 1 -
 server/initializers/migrations/0050-video-language.ts         | 1 -
 server/initializers/migrations/0055-video-uuid.ts             | 1 -
 server/initializers/migrations/0060-video-file.ts             | 1 -
 server/initializers/migrations/0065-video-file-size.ts        | 1 -
 server/initializers/migrations/0070-user-video-quota.ts       | 1 -
 server/initializers/migrations/0130-user-autoplay-video.ts    | 1 -
 server/initializers/migrations/0150-avatar-cascade.ts         | 3 ++-
 server/initializers/migrations/0410-video-playlist-element.ts | 3 ++-
 17 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'server/initializers')

diff --git a/server/initializers/migrations/0005-email-pod.ts b/server/initializers/migrations/0005-email-pod.ts
index 417c33b1f..025bcdb59 100644
--- a/server/initializers/migrations/0005-email-pod.ts
+++ b/server/initializers/migrations/0005-email-pod.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0010-email-user.ts b/server/initializers/migrations/0010-email-user.ts
index f7d01f6d6..4193b7ff9 100644
--- a/server/initializers/migrations/0010-email-user.ts
+++ b/server/initializers/migrations/0010-email-user.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0015-video-views.ts b/server/initializers/migrations/0015-video-views.ts
index 47dd4069b..aa80ffbcc 100644
--- a/server/initializers/migrations/0015-video-views.ts
+++ b/server/initializers/migrations/0015-video-views.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0020-video-likes.ts b/server/initializers/migrations/0020-video-likes.ts
index 44333f3b0..aae815a8e 100644
--- a/server/initializers/migrations/0020-video-likes.ts
+++ b/server/initializers/migrations/0020-video-likes.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0025-video-dislikes.ts b/server/initializers/migrations/0025-video-dislikes.ts
index 2aa22e2d7..6eb6fb9dc 100644
--- a/server/initializers/migrations/0025-video-dislikes.ts
+++ b/server/initializers/migrations/0025-video-dislikes.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0030-video-category.ts b/server/initializers/migrations/0030-video-category.ts
index 00cd2d8cf..dd3922549 100644
--- a/server/initializers/migrations/0030-video-category.ts
+++ b/server/initializers/migrations/0030-video-category.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0035-video-licence.ts b/server/initializers/migrations/0035-video-licence.ts
index 61d666c5e..b4224d758 100644
--- a/server/initializers/migrations/0035-video-licence.ts
+++ b/server/initializers/migrations/0035-video-licence.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0040-video-nsfw.ts b/server/initializers/migrations/0040-video-nsfw.ts
index 44aec8a6c..d5aad3e53 100644
--- a/server/initializers/migrations/0040-video-nsfw.ts
+++ b/server/initializers/migrations/0040-video-nsfw.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0045-user-display-nsfw.ts b/server/initializers/migrations/0045-user-display-nsfw.ts
index 07795bd75..5226a25eb 100644
--- a/server/initializers/migrations/0045-user-display-nsfw.ts
+++ b/server/initializers/migrations/0045-user-display-nsfw.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0050-video-language.ts b/server/initializers/migrations/0050-video-language.ts
index 6f90abb44..0cd518272 100644
--- a/server/initializers/migrations/0050-video-language.ts
+++ b/server/initializers/migrations/0050-video-language.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0055-video-uuid.ts b/server/initializers/migrations/0055-video-uuid.ts
index 8a58aebb8..525a69ea5 100644
--- a/server/initializers/migrations/0055-video-uuid.ts
+++ b/server/initializers/migrations/0055-video-uuid.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0060-video-file.ts b/server/initializers/migrations/0060-video-file.ts
index 00647e60e..f07fa7780 100644
--- a/server/initializers/migrations/0060-video-file.ts
+++ b/server/initializers/migrations/0060-video-file.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0065-video-file-size.ts b/server/initializers/migrations/0065-video-file-size.ts
index 0bdc675c2..1aeb27f2d 100644
--- a/server/initializers/migrations/0065-video-file-size.ts
+++ b/server/initializers/migrations/0065-video-file-size.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { stat } from 'fs-extra'
 import { VideoModel } from '../../models/video/video'
 import { getVideoFilePath } from '@server/lib/video-paths'
diff --git a/server/initializers/migrations/0070-user-video-quota.ts b/server/initializers/migrations/0070-user-video-quota.ts
index 1d073f244..3fc4d2970 100644
--- a/server/initializers/migrations/0070-user-video-quota.ts
+++ b/server/initializers/migrations/0070-user-video-quota.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 import { Migration } from '../../models/migrations'
 
 function up (utils: {
diff --git a/server/initializers/migrations/0130-user-autoplay-video.ts b/server/initializers/migrations/0130-user-autoplay-video.ts
index d57934588..8f2767266 100644
--- a/server/initializers/migrations/0130-user-autoplay-video.ts
+++ b/server/initializers/migrations/0130-user-autoplay-video.ts
@@ -1,5 +1,4 @@
 import * as Sequelize from 'sequelize'
-import * as Promise from 'bluebird'
 
 function up (utils: {
   transaction: Sequelize.Transaction
diff --git a/server/initializers/migrations/0150-avatar-cascade.ts b/server/initializers/migrations/0150-avatar-cascade.ts
index fb3b25773..ecf3467a0 100644
--- a/server/initializers/migrations/0150-avatar-cascade.ts
+++ b/server/initializers/migrations/0150-avatar-cascade.ts
@@ -7,7 +7,8 @@ async function up (utils: {
 }): Promise<void> {
   await utils.queryInterface.removeConstraint('actor', 'actor_avatarId_fkey')
 
-  await utils.queryInterface.addConstraint('actor', [ 'avatarId' ], {
+  await utils.queryInterface.addConstraint('actor', {
+    fields: [ 'avatarId' ],
     type: 'foreign key',
     references: {
       table: 'avatar',
diff --git a/server/initializers/migrations/0410-video-playlist-element.ts b/server/initializers/migrations/0410-video-playlist-element.ts
index 1b4692357..be61b932b 100644
--- a/server/initializers/migrations/0410-video-playlist-element.ts
+++ b/server/initializers/migrations/0410-video-playlist-element.ts
@@ -18,7 +18,8 @@ async function up (utils: {
 
   await utils.queryInterface.removeConstraint('videoPlaylistElement', 'videoPlaylistElement_videoId_fkey')
 
-  await utils.queryInterface.addConstraint('videoPlaylistElement', [ 'videoId' ], {
+  await utils.queryInterface.addConstraint('videoPlaylistElement', {
+    fields: [ 'videoId' ],
     type: 'foreign key',
     references: {
       table: 'video',
-- 
cgit v1.2.3