From cbfbf97af152d1aded5916a5621ebdbe66b615e6 Mon Sep 17 00:00:00 2001 From: Fahad Khan Date: Tue, 17 Sep 2024 19:33:16 -0700 Subject: [PATCH] added BootStrap call in case where default db name is not used --- client/orm/models_boot.go | 9 +++++++-- client/orm/orm.go | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/orm/models_boot.go b/client/orm/models_boot.go index 7ecd999e..f439f7f3 100644 --- a/client/orm/models_boot.go +++ b/client/orm/models_boot.go @@ -45,8 +45,13 @@ func RegisterModelWithSuffix(suffix string, models ...interface{}) { // BootStrap Bootstrap models. // make All model parsed and can not add more models func BootStrap() { - if dataBaseCache.getDefault() == nil { - fmt.Println("must have one Register DataBase alias named `default`") + BootStrapWithAlias("default") +} + +// BootStrap with alias +func BootStrapWithAlias(alias string) { + if _, ok := dataBaseCache.get(alias); !ok { + fmt.Printf("must have one Register DataBase alias named %q\n", alias) debug.PrintStack() return } diff --git a/client/orm/orm.go b/client/orm/orm.go index 5b1a27d0..3dd9f54f 100644 --- a/client/orm/orm.go +++ b/client/orm/orm.go @@ -621,7 +621,6 @@ func (t *txOrm) RollbackUnlessCommit() error { // NewOrm create new orm func NewOrm() Ormer { - BootStrap() // execute only once return NewOrmUsingDB(`default`) } @@ -644,6 +643,8 @@ func NewOrmWithDB(driverName, aliasName string, db *sql.DB, params ...DBOption) } func newDBWithAlias(al *alias) Ormer { + BootStrapWithAlias(al.Name) // execute only once + o := new(orm) o.alias = al