merge upstream 2025-02-03

1 files changed, 23 insertions, 0 deletions

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 4af1140f36..e980b40224 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -52,6 +52,9 @@ type Source = {
 	redisForJobQueue?: RedisOptionsSource;
 	redisForTimelines?: RedisOptionsSource;
 	redisForReactions?: RedisOptionsSource;
+	fulltextSearch?: {
+		provider?: FulltextSearchProvider;
+	};
 	meilisearch?: {
 		host: string;
 		port: string;
@@ -118,6 +121,13 @@ type Source = {
 
 	pidFile: string;
 	filePermissionBits?: string;
+
+	logging?: {
+		sql?: {
+			disableQueryTruncation? : boolean,
+			enableQueryParamLogging? : boolean,
+		}
+	}
 };
 
 export type Config = {
@@ -143,6 +153,9 @@ export type Config = {
 		user: string;
 		pass: string;
 	}[] | undefined;
+	fulltextSearch?: {
+		provider?: FulltextSearchProvider;
+	};
 	meilisearch: {
 		host: string;
 		port: string;
@@ -179,6 +192,12 @@ export type Config = {
 	signToActivityPubGet: boolean;
 	attachLdSignatureForRelays: boolean;
 	checkActivityPubGetSignature: boolean | undefined;
+	logging?: {
+		sql?: {
+			disableQueryTruncation? : boolean,
+			enableQueryParamLogging? : boolean,
+		}
+	}
 
 	version: string;
 	publishTarballInsteadOfProvideRepositoryUrl: boolean;
@@ -219,6 +238,8 @@ export type Config = {
 	filePermissionBits?: string;
 };
 
+export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch';
+
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
@@ -302,6 +323,7 @@ export function loadConfig(): Config {
 		db: { ...config.db, db: dbDb, user: dbUser, pass: dbPass },
 		dbReplications: config.dbReplications,
 		dbSlaves: config.dbSlaves,
+		fulltextSearch: config.fulltextSearch,
 		meilisearch: config.meilisearch,
 		redis,
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
@@ -354,6 +376,7 @@ export function loadConfig(): Config {
 		import: config.import,
 		pidFile: config.pidFile,
 		filePermissionBits: config.filePermissionBits,
+		logging: config.logging,
 	};
 }