aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-05-25 09:00:13 +0200
committerChocobozzz <me@florianbigard.com>2020-05-25 09:00:13 +0200
commitba4e1a059d42c765131ac66c1d8df963a66450b6 (patch)
treed521c2b2c073a6f710094d579cab2dcbe255921e
parent4270a19fb62b8aba0f638034e4b8d8a6bca0c907 (diff)
parentd2a5c4e15003d1e8904b389810d78e26db2cebfc (diff)
downloadPeerTube-ba4e1a059d42c765131ac66c1d8df963a66450b6.tar.gz
PeerTube-ba4e1a059d42c765131ac66c1d8df963a66450b6.tar.zst
PeerTube-ba4e1a059d42c765131ac66c1d8df963a66450b6.zip
Merge branch 'release/2.2.0' into develop
-rw-r--r--server/initializers/constants.ts2
-rw-r--r--server/initializers/migrations/0485-video-file-metadata.ts30
-rw-r--r--server/initializers/migrations/0510-video-file-metadata.ts38
3 files changed, 39 insertions, 31 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 676d9804b..d201df3d8 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
14 14
15// --------------------------------------------------------------------------- 15// ---------------------------------------------------------------------------
16 16
17const LAST_MIGRATION_VERSION = 505 17const LAST_MIGRATION_VERSION = 510
18 18
19// --------------------------------------------------------------------------- 19// ---------------------------------------------------------------------------
20 20
diff --git a/server/initializers/migrations/0485-video-file-metadata.ts b/server/initializers/migrations/0485-video-file-metadata.ts
deleted file mode 100644
index 5d95be024..000000000
--- a/server/initializers/migrations/0485-video-file-metadata.ts
+++ /dev/null
@@ -1,30 +0,0 @@
1import * as Sequelize from 'sequelize'
2
3async function up (utils: {
4 transaction: Sequelize.Transaction
5 queryInterface: Sequelize.QueryInterface
6 sequelize: Sequelize.Sequelize
7}): Promise<void> {
8
9 const metadata = {
10 type: Sequelize.JSONB,
11 allowNull: true
12 }
13 await utils.queryInterface.addColumn('videoFile', 'metadata', metadata)
14
15 const metadataUrl = {
16 type: Sequelize.STRING,
17 allowNull: true
18 }
19 await utils.queryInterface.addColumn('videoFile', 'metadataUrl', metadataUrl)
20
21}
22
23function down (options) {
24 throw new Error('Not implemented.')
25}
26
27export {
28 up,
29 down
30}
diff --git a/server/initializers/migrations/0510-video-file-metadata.ts b/server/initializers/migrations/0510-video-file-metadata.ts
new file mode 100644
index 000000000..be9feb47a
--- /dev/null
+++ b/server/initializers/migrations/0510-video-file-metadata.ts
@@ -0,0 +1,38 @@
1import * as Sequelize from 'sequelize'
2
3async function up (utils: {
4 transaction: Sequelize.Transaction
5 queryInterface: Sequelize.QueryInterface
6 sequelize: Sequelize.Sequelize
7}): Promise<void> {
8
9 // We made a mistake with the migration in 2.2.0-rc.1
10 // Docker containers did not include this migration file
11 // So we check the table definition and add the column if it does not exist
12 const tableDefinition = await utils.queryInterface.describeTable('videoFile')
13
14 if (!tableDefinition['metadata']) {
15 const metadata = {
16 type: Sequelize.JSONB,
17 allowNull: true
18 }
19 await utils.queryInterface.addColumn('videoFile', 'metadata', metadata)
20 }
21
22 if (!tableDefinition['metadataUrl']) {
23 const metadataUrl = {
24 type: Sequelize.STRING,
25 allowNull: true
26 }
27 await utils.queryInterface.addColumn('videoFile', 'metadataUrl', metadataUrl)
28 }
29}
30
31function down (options) {
32 throw new Error('Not implemented.')
33}
34
35export {
36 up,
37 down
38}