diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f3d6dc..a981bba1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,3 +73,4 @@ - [4647](https://github.com/beego/beego/pull/4647) - [4648](https://github.com/beego/beego/pull/4648) - [4649](https://github.com/beego/beego/pull/4649) +- [4660](https://github.com/beego/beego/pull/4660) diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go index 8e0e67a9..12fb9492 100644 --- a/client/orm/orm_test.go +++ b/client/orm/orm_test.go @@ -2760,6 +2760,7 @@ func TestStrPkInsert(t *testing.T) { if err != nil { fmt.Println(err) if err.Error() == "postgres version must 9.5 or higher" || err.Error() == "`sqlite3` nonsupport InsertOrUpdate in beego" { + return } else if err == ErrLastInsertIdUnavailable { return } else { diff --git a/core/config/json/json.go b/core/config/json/json.go index 21f2b958..098f0308 100644 --- a/core/config/json/json.go +++ b/core/config/json/json.go @@ -210,7 +210,6 @@ func (c *JSONConfigContainer) String(key string) (string, error) { // DefaultString returns the string value for a given key. // if err != nil return defaultval func (c *JSONConfigContainer) DefaultString(key string, defaultVal string) string { - // TODO FIXME should not use "" to replace non existence if v, err := c.String(key); v != "" && err == nil { return v } diff --git a/core/logs/log.go b/core/logs/log.go index ad2ef953..aeb2d96b 100644 --- a/core/logs/log.go +++ b/core/logs/log.go @@ -520,49 +520,19 @@ func (bl *BeeLogger) Debug(format string, v ...interface{}) { // Warn Log WARN level message. // compatibility alias for Warning() func (bl *BeeLogger) Warn(format string, v ...interface{}) { - if LevelWarn > bl.level { - return - } - lm := &LogMsg{ - Level: LevelWarn, - Msg: format, - When: time.Now(), - Args: v, - } - - bl.writeMsg(lm) + bl.Warning(format, v...) } // Info Log INFO level message. // compatibility alias for Informational() func (bl *BeeLogger) Info(format string, v ...interface{}) { - if LevelInfo > bl.level { - return - } - lm := &LogMsg{ - Level: LevelInfo, - Msg: format, - When: time.Now(), - Args: v, - } - - bl.writeMsg(lm) + bl.Informational(format, v...) } // Trace Log TRACE level message. // compatibility alias for Debug() func (bl *BeeLogger) Trace(format string, v ...interface{}) { - if LevelDebug > bl.level { - return - } - lm := &LogMsg{ - Level: LevelDebug, - Msg: format, - When: time.Now(), - Args: v, - } - - bl.writeMsg(lm) + bl.Debug(format, v...) } // Flush flush all chan data.