From 942647ab9c4fd09f6b83e004ecfc0faca5849fc3 Mon Sep 17 00:00:00 2001 From: perf3ct Date: Tue, 4 Nov 2025 14:47:46 -0800 Subject: [PATCH] fix(search): get rid of exporting dbConnection --- apps/server/src/services/sql.ts | 7 +------ apps/server/src/services/sql_init.ts | 16 ++-------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/apps/server/src/services/sql.ts b/apps/server/src/services/sql.ts index 36d627778..6f366e997 100644 --- a/apps/server/src/services/sql.ts +++ b/apps/server/src/services/sql.ts @@ -389,10 +389,6 @@ function disableSlowQueryLogging(cb: () => T) { } } -function getDbConnection(): DatabaseType { - return dbConnection; -} - export default { insert, replace, @@ -460,6 +456,5 @@ export default { fillParamList, copyDatabase, disableSlowQueryLogging, - rebuildIntegrationTestDatabase, - getDbConnection + rebuildIntegrationTestDatabase }; diff --git a/apps/server/src/services/sql_init.ts b/apps/server/src/services/sql_init.ts index dca2d56dc..e0a89295e 100644 --- a/apps/server/src/services/sql_init.ts +++ b/apps/server/src/services/sql_init.ts @@ -67,20 +67,8 @@ async function initDbConnection() { PRIMARY KEY (tmpID) );`) - // Register SQLite search functions after database is ready - try { - const { getSqliteFunctionsService } = await import("./search/sqlite_functions.js"); - const functionsService = getSqliteFunctionsService(); - const db = sql.getDbConnection(); - - if (functionsService.registerFunctions(db)) { - log.info("SQLite search functions registered successfully"); - } else { - log.info("SQLite search functions registration skipped (already registered)"); - } - } catch (error) { - log.error(`Failed to register SQLite search functions: ${error}`); - } + // Note: SQLite search functions are now initialized directly in sql.ts + // This ensures they're available before any queries run dbReady.resolve(); }