From a8407618bd2218e08110f0bb5f47c113f35b3971 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 20 Jun 2023 09:18:41 +0200 Subject: [PATCH] merge conflicts solved --- .../Community.ts | 3 +++ .../FederatedCommunity.ts | 0 database/entity/FederatedCommunity.ts | 2 +- ...ey_length.ts => 0068-community_tables_public_key_length.ts} | 0 4 files changed, 4 insertions(+), 1 deletion(-) rename database/entity/{0067-community_tables_public_key_length => 0068-community_tables_public_key_length}/Community.ts (93%) rename database/entity/{0067-community_tables_public_key_length => 0068-community_tables_public_key_length}/FederatedCommunity.ts (100%) rename database/migrations/{0067-community_tables_public_key_length.ts => 0068-community_tables_public_key_length.ts} (100%) diff --git a/database/entity/0067-community_tables_public_key_length/Community.ts b/database/entity/0068-community_tables_public_key_length/Community.ts similarity index 93% rename from database/entity/0067-community_tables_public_key_length/Community.ts rename to database/entity/0068-community_tables_public_key_length/Community.ts index 382025c83..e6f8d255c 100644 --- a/database/entity/0067-community_tables_public_key_length/Community.ts +++ b/database/entity/0068-community_tables_public_key_length/Community.ts @@ -21,6 +21,9 @@ export class Community extends BaseEntity { @Column({ name: 'public_key', type: 'binary', length: 32, nullable: false }) publicKey: Buffer + @Column({ name: 'private_key', type: 'binary', length: 64, nullable: true }) + privateKey: Buffer | null + @Column({ name: 'community_uuid', type: 'char', diff --git a/database/entity/0067-community_tables_public_key_length/FederatedCommunity.ts b/database/entity/0068-community_tables_public_key_length/FederatedCommunity.ts similarity index 100% rename from database/entity/0067-community_tables_public_key_length/FederatedCommunity.ts rename to database/entity/0068-community_tables_public_key_length/FederatedCommunity.ts diff --git a/database/entity/FederatedCommunity.ts b/database/entity/FederatedCommunity.ts index 3b636af09..37a33e4d9 100644 --- a/database/entity/FederatedCommunity.ts +++ b/database/entity/FederatedCommunity.ts @@ -1 +1 @@ -export { FederatedCommunity } from './0067-community_tables_public_key_length/FederatedCommunity' +export { FederatedCommunity } from './0068-community_tables_public_key_length/FederatedCommunity' diff --git a/database/migrations/0067-community_tables_public_key_length.ts b/database/migrations/0068-community_tables_public_key_length.ts similarity index 100% rename from database/migrations/0067-community_tables_public_key_length.ts rename to database/migrations/0068-community_tables_public_key_length.ts