From 62c4552535f5555999f8e2f0f146894bff937323 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:24 +0100 Subject: [PATCH 1/4] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 5f64c34bc..069c9038f 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -6,7 +6,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From 8ad35aa5f364d74ea9569c454e480b2aef2553f1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:35 +0100 Subject: [PATCH 2/4] Update database/entity/0001-init_db/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0001-init_db/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts index 069c9038f..7280dca40 100644 --- a/database/entity/0001-init_db/User.ts +++ b/database/entity/0001-init_db/User.ts @@ -9,7 +9,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' }) From aacfaa67c4e457ba753de8f231b993a0a31ef501 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:22:51 +0100 Subject: [PATCH 3/4] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index 8ec279fdb..f3533fd86 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -7,7 +7,7 @@ export class User extends BaseEntity { @PrimaryGeneratedColumn('increment', { unsigned: true }) id: number - @Column({ default: 0, name: 'index_id' }) + @Column({ name: 'index_id', default: 0 }) indexId: number @Column({ default: 0, name: 'group_id', unsigned: true }) From c8720673fd0f3323a547959c55b514197f3a810c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 26 Nov 2021 12:23:00 +0100 Subject: [PATCH 4/4] Update database/entity/0002-add_settings/User.ts Co-authored-by: Ulf Gebhardt --- database/entity/0002-add_settings/User.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts index f3533fd86..6f3067c79 100644 --- a/database/entity/0002-add_settings/User.ts +++ b/database/entity/0002-add_settings/User.ts @@ -10,7 +10,7 @@ export class User extends BaseEntity { @Column({ name: 'index_id', default: 0 }) indexId: number - @Column({ default: 0, name: 'group_id', unsigned: true }) + @Column({ name: 'group_id', default: 0, unsigned: true }) groupId: number @Column({ type: 'binary', length: 32, name: 'public_key' })