From 906d700f19383380e5e50ce15c3699261aaf635d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= Date: Wed, 8 Jun 2022 03:21:25 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/1920-feature-create-contribution-link-table' into 1921-feature-contribution-link-crud-in-admin-resolver --- .../0037-add_contribution_links_table/ContributionLinks.ts | 2 +- database/migrations/0037-add_contribution_links_table.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database/entity/0037-add_contribution_links_table/ContributionLinks.ts b/database/entity/0037-add_contribution_links_table/ContributionLinks.ts index 6539716c6..26ecc6cea 100644 --- a/database/entity/0037-add_contribution_links_table/ContributionLinks.ts +++ b/database/entity/0037-add_contribution_links_table/ContributionLinks.ts @@ -11,7 +11,7 @@ export class ContributionLinks extends BaseEntity { name: string @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' }) - description: string + memo: string @Column({ name: 'valid_from', type: 'datetime', nullable: true, default: null }) validFrom: Date | null diff --git a/database/migrations/0037-add_contribution_links_table.ts b/database/migrations/0037-add_contribution_links_table.ts index 42f03184b..bd56c7fee 100644 --- a/database/migrations/0037-add_contribution_links_table.ts +++ b/database/migrations/0037-add_contribution_links_table.ts @@ -11,7 +11,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis CREATE TABLE IF NOT EXISTS \`contribution_links\` ( \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT, \`name\` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, - \`decsription\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + \`memo\` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, \`valid_from\` datetime NULL, \`valid_to\` datetime NULL, \`amount\` bigint(20) NOT NULL,