Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 16 Pull requests Projects Releases 34 Packages Wiki Activity Actions

Merge branch 'develop' into feature/#71-settings-store

Browse source 
# Conflicts:
#	src/data-source.ts
This commit is contained in:
Julian Krauser 2025-04-30 12:30:55 +02:00
commit 753cfdd5da
8 changed files with 85 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/data-source.ts
View file

@ -1,6 +1,7 @@
import "dotenv/config";
import "reflect-metadata";
import { DataSource } from "typeorm";
import { DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_TYPE, DB_USERNAME } from "./env.defaults";
import { user } from "./entity/management/user";
import { refresh } from "./entity/refresh";
@ -43,6 +44,7 @@ import { newsletterConfig } from "./entity/configuration/newsletterConfig";
import { webapi } from "./entity/management/webapi";
import { webapiPermission } from "./entity/management/webapi_permission";
import { salutation } from "./entity/configuration/salutation";
import { setting } from "./entity/management/setting";
import { BackupAndResetDatabase1738166124200 } from "./migrations/1738166124200-BackupAndResetDatabase";
import { CreateSchema1738166167472 } from "./migrations/1738166167472-CreateSchema";
@ -50,9 +52,8 @@ import { TemplatesAndProtocolSort1742549956787 } from "./migrations/174254995678
import { QueryToUUID1742922178643 } from "./migrations/1742922178643-queryToUUID";
import { NewsletterColumnType1744351418751 } from "./migrations/1744351418751-newsletterColumnType";
import { QueryUpdatedAt1744795756230 } from "./migrations/1744795756230-QueryUpdatedAt";
import { setting } from "./entity/management/setting";
import { SettingsFromEnv1745059495808 } from "./migrations/1745059495808-settingsFromEnv";
import { DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_TYPE, DB_USERNAME } from "./env.defaults";
import { MemberCreatedAt1746006549262 } from "./migrations/1746006549262-memberCreatedAt";
const dataSource = new DataSource({
type: DB_TYPE as any,
@ -115,6 +116,7 @@ const dataSource = new DataSource({
NewsletterColumnType1744351418751,
QueryUpdatedAt1744795756230,
SettingsFromEnv1745059495808,
MemberCreatedAt1746006549262,
],
migrationsRun: true,
migrationsTransactionMode: "each",