diff options
author | Chocobozzz <me@florianbigard.com> | 2019-05-13 14:37:30 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-05-13 14:37:30 +0200 |
commit | 241c3357d13ac2fb4c8ffca6469e575388c1fac5 (patch) | |
tree | 0b9a374bd01f8e05ef85a14aeffc8bd3eb6f4eae /server | |
parent | b59f12b0955d34b447a2bbcd3fbb0eb40b241631 (diff) | |
download | PeerTube-241c3357d13ac2fb4c8ffca6469e575388c1fac5.tar.gz PeerTube-241c3357d13ac2fb4c8ffca6469e575388c1fac5.tar.zst PeerTube-241c3357d13ac2fb4c8ffca6469e575388c1fac5.zip |
Fix account description error
Diffstat (limited to 'server')
-rw-r--r-- | server/initializers/constants.ts | 2 | ||||
-rw-r--r-- | server/initializers/migrations/0375-account-description.ts | 25 | ||||
-rw-r--r-- | server/models/account/account.ts | 6 |
3 files changed, 29 insertions, 4 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 3fce864bd..62778ae58 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 | ||
17 | const LAST_MIGRATION_VERSION = 370 | 17 | const LAST_MIGRATION_VERSION = 375 |
18 | 18 | ||
19 | // --------------------------------------------------------------------------- | 19 | // --------------------------------------------------------------------------- |
20 | 20 | ||
diff --git a/server/initializers/migrations/0375-account-description.ts b/server/initializers/migrations/0375-account-description.ts new file mode 100644 index 000000000..1258563fd --- /dev/null +++ b/server/initializers/migrations/0375-account-description.ts | |||
@@ -0,0 +1,25 @@ | |||
1 | import * as Sequelize from 'sequelize' | ||
2 | |||
3 | async function up (utils: { | ||
4 | transaction: Sequelize.Transaction, | ||
5 | queryInterface: Sequelize.QueryInterface, | ||
6 | sequelize: Sequelize.Sequelize, | ||
7 | db: any | ||
8 | }): Promise<void> { | ||
9 | const data = { | ||
10 | type: Sequelize.STRING(1000), | ||
11 | allowNull: true, | ||
12 | defaultValue: null | ||
13 | } | ||
14 | |||
15 | await utils.queryInterface.changeColumn('account', 'description', data) | ||
16 | } | ||
17 | |||
18 | function down (options) { | ||
19 | throw new Error('Not implemented.') | ||
20 | } | ||
21 | |||
22 | export { | ||
23 | up, | ||
24 | down | ||
25 | } | ||
diff --git a/server/models/account/account.ts b/server/models/account/account.ts index c53312990..2b04acd86 100644 --- a/server/models/account/account.ts +++ b/server/models/account/account.ts | |||
@@ -3,7 +3,7 @@ import { | |||
3 | BeforeDestroy, | 3 | BeforeDestroy, |
4 | BelongsTo, | 4 | BelongsTo, |
5 | Column, | 5 | Column, |
6 | CreatedAt, | 6 | CreatedAt, DataType, |
7 | Default, | 7 | Default, |
8 | DefaultScope, | 8 | DefaultScope, |
9 | ForeignKey, | 9 | ForeignKey, |
@@ -26,7 +26,7 @@ import { VideoCommentModel } from '../video/video-comment' | |||
26 | import { UserModel } from './user' | 26 | import { UserModel } from './user' |
27 | import { AvatarModel } from '../avatar/avatar' | 27 | import { AvatarModel } from '../avatar/avatar' |
28 | import { VideoPlaylistModel } from '../video/video-playlist' | 28 | import { VideoPlaylistModel } from '../video/video-playlist' |
29 | import { WEBSERVER } from '../../initializers/constants' | 29 | import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants' |
30 | import { Op, Transaction, WhereOptions } from 'sequelize' | 30 | import { Op, Transaction, WhereOptions } from 'sequelize' |
31 | 31 | ||
32 | export enum ScopeNames { | 32 | export enum ScopeNames { |
@@ -91,7 +91,7 @@ export class AccountModel extends Model<AccountModel> { | |||
91 | @AllowNull(true) | 91 | @AllowNull(true) |
92 | @Default(null) | 92 | @Default(null) |
93 | @Is('AccountDescription', value => throwIfNotValid(value, isAccountDescriptionValid, 'description', true)) | 93 | @Is('AccountDescription', value => throwIfNotValid(value, isAccountDescriptionValid, 'description', true)) |
94 | @Column | 94 | @Column(DataType.STRING(CONSTRAINTS_FIELDS.USERS.DESCRIPTION.max)) |
95 | description: string | 95 | description: string |
96 | 96 | ||
97 | @CreatedAt | 97 | @CreatedAt |