go-toolkit/dbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert InitModuleDB pattern, back to single ModuleDB func

Browse Source
This commit is contained in:
Elijah Duffy
2025-06-12 17:45:09 -07:00
parent 32567471e1
commit d5c7926e97
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dbx.go
View File

@@ -92,17 +92,8 @@ func SQLO() *sql.DB {
return sqlDB
}
// ModuleDB returns the existing database module, or panics if it has not
// been initialized yet.
func ModuleDB() *app.Module {
if dbxshared.DBModule == nil {
panic("ModuleDB not initialized yet")
}
return dbxshared.DBModule
}
// InitModuleDB returns the database module with the provided configuration.
func InitModuleDB(dialect Dialect, cfg *DBConfig, forceDebugLog bool) *app.Module {
// ModuleDB returns the database module with the provided configuration.
func ModuleDB(dialect Dialect, cfg *DBConfig, forceDebugLog bool) *app.Module {
if dbxshared.DBModule != nil {
panic("ModuleDB initialized multiple times")
}

2
dbxm/mysql.go
View File

@@ -76,7 +76,7 @@ type _mysqlLogger struct{}
func (_mysqlLogger) InitLogger() {
mysql.SetQueryLogger(func(ctx context.Context, queryInfo mysql.QueryInfo) {
_, args := queryInfo.Statement.Sql()
dbx.ModuleDB().Logger().Debug(
dbxshared.DBModule.Logger().Debug(
"Executed SQL query",
"args", args,
"duration", queryInfo.Duration,

2
dbxp/pxg.go
View File

@@ -76,7 +76,7 @@ type _postgresLogger struct{}
func (_postgresLogger) InitLogger() {
postgres.SetQueryLogger(func(ctx context.Context, queryInfo postgres.QueryInfo) {
_, args := queryInfo.Statement.Sql()
dbx.ModuleDB().Logger().Debug(
dbxshared.DBModule.Logger().Debug(
"Executed SQL query",
"args", args,
"duration", queryInfo.Duration,