1
0
mirror of https://github.com/astaxie/beego.git synced 2025-06-11 20:10:40 +00:00

deprecated orm.go and add NewOrmUsingDB method

This commit is contained in:
Ming Deng
2020-07-27 21:19:34 +08:00
parent 93eb7c6b83
commit 2e7fb81348
3 changed files with 38 additions and 5 deletions

View File

@ -42,3 +42,13 @@ func TestRegisterDataBase(t *testing.T) {
assert.Equal(t, al.MaxOpenConns, 300)
assert.Equal(t, al.ConnMaxLifetime, time.Minute)
}
func TestDBCache(t *testing.T) {
dataBaseCache.add("test1", &alias{})
dataBaseCache.add("default", &alias{})
al := dataBaseCache.getDefault()
assert.NotNil(t, al)
al, ok := dataBaseCache.get("test1")
assert.NotNil(t, al)
assert.True(t, ok)
}

View File

@ -591,10 +591,13 @@ func (t *txOrm) Rollback() error {
// NewOrm create new orm
func NewOrm() Ormer {
BootStrap() // execute only once
return NewOrmUsingDB(`default`)
}
// NewOrm create new orm with the name
func NewOrmUsingDB(aliasName string) Ormer {
o := new(orm)
name := `default`
if al, ok := dataBaseCache.get(name); ok {
if al, ok := dataBaseCache.get(aliasName); ok {
o.alias = al
if Debug {
o.db = newDbQueryLog(al, al.DB)
@ -602,9 +605,8 @@ func NewOrm() Ormer {
o.db = al.DB
}
} else {
panic(fmt.Errorf("<Ormer.Using> unknown db alias name `%s`", name))
panic(fmt.Errorf("<Ormer.Using> unknown db alias name `%s`", aliasName))
}
return o
}