From 7fd65ae318ebc49f90be74c87b270b165167ed45 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 3 Feb 2022 04:00:09 +0100 Subject: [PATCH] updated old entity definitions to be more correct --- database/entity/0001-init_db/User.ts | 6 +++--- database/entity/0002-add_settings/User.ts | 6 +++--- .../entity/0003-login_server_tables/LoginUser.ts | 12 ++++++------ .../entity/0006-login_users_collation/LoginUser.ts | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index b349e2584..be2c4c5ad 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -7,13 +7,13 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'index_id', default: 0 }) + @Column({ name: 'index_id', type: 'smallint', default: 0, nullable: false }) indexId: number @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number - @Column({ type: 'binary', length: 32, name: 'public_key' }) + @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true }) pubkey: Buffer @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' }) @@ -40,7 +40,7 @@ export class User extends BaseEntity { @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' }) username: string - @Column() + @Column({ type: 'bool', default: false }) disabled: boolean @OneToOne(() => Balance, (balance) => balance.user) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index 40f5d400a..a756cbbd5 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -7,13 +7,13 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ name: 'index_id', default: 0 }) + @Column({ name: 'index_id', type: 'smallint', default: 0, nullable: false }) indexId: number @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number - @Column({ type: 'binary', length: 32, name: 'public_key' }) + @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true }) pubkey: Buffer @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' }) @@ -40,7 +40,7 @@ export class User extends BaseEntity { @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' }) username: string - @Column() + @Column({ type: 'bool', default: false }) disabled: boolean @OneToMany(() => UserSetting, (userSetting) => userSetting.user) diff --git a/database/entity/0003-login_server_tables/LoginUser.ts b/database/entity/0003-login_server_tables/LoginUser.ts index 07816254f..cacc27be1 100644 --- a/database/entity/0003-login_server_tables/LoginUser.ts +++ b/database/entity/0003-login_server_tables/LoginUser.ts @@ -19,7 +19,7 @@ export class LoginUser extends BaseEntity { @Column({ length: 255, default: '' }) username: string - @Column({ default: '', nullable: true }) + @Column({ type: 'mediumtext', default: '', nullable: true }) description: string @Column({ type: 'bigint', default: 0, unsigned: true }) @@ -34,19 +34,19 @@ export class LoginUser extends BaseEntity { @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true }) emailHash: Buffer - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false }) createdAt: Date - @Column({ name: 'email_checked', default: 0 }) + @Column({ name: 'email_checked', type: 'bool', nullable: false, default: false }) emailChecked: boolean - @Column({ name: 'passphrase_shown', default: 0 }) + @Column({ name: 'passphrase_shown', type: 'bool', nullable: false, default: false }) passphraseShown: boolean - @Column({ length: 4, default: 'de' }) + @Column({ length: 4, default: 'de', nullable: false }) language: string - @Column({ default: 0 }) + @Column({ type: 'bool', default: false }) disabled: boolean @Column({ name: 'group_id', default: 0, unsigned: true }) diff --git a/database/entity/0006-login_users_collation/LoginUser.ts b/database/entity/0006-login_users_collation/LoginUser.ts index e12c82e27..f29a46ffe 100644 --- a/database/entity/0006-login_users_collation/LoginUser.ts +++ b/database/entity/0006-login_users_collation/LoginUser.ts @@ -19,7 +19,7 @@ export class LoginUser extends BaseEntity { @Column({ length: 255, default: '', collation: 'utf8mb4_unicode_ci' }) username: string - @Column({ default: '', collation: 'utf8mb4_unicode_ci', nullable: true }) + @Column({ type: 'mediumtext', default: '', collation: 'utf8mb4_unicode_ci', nullable: true }) description: string @Column({ type: 'bigint', default: 0, unsigned: true }) @@ -34,19 +34,19 @@ export class LoginUser extends BaseEntity { @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true }) emailHash: Buffer - @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false }) createdAt: Date - @Column({ name: 'email_checked', default: 0 }) + @Column({ name: 'email_checked', type: 'bool', nullable: false, default: false }) emailChecked: boolean - @Column({ name: 'passphrase_shown', default: 0 }) + @Column({ name: 'passphrase_shown', type: 'bool', nullable: false, default: false }) passphraseShown: boolean - @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci' }) + @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false }) language: string - @Column({ default: 0 }) + @Column({ type: 'bool', default: false }) disabled: boolean @Column({ name: 'group_id', default: 0, unsigned: true })