Merge 36ea322ee8f1666cc97530f5fd5561d909efd105 into e1ce3b706624d5a28d7d7bc4b48c9e61eac14896
This commit is contained in:
commit
7ad080c6c6
@ -24,6 +24,9 @@ var defaultLogger = Logger{log.New(os.Stdout, "\r\n", 0)}
|
|||||||
var sqlRegexp = regexp.MustCompile(`(\$\d+)|\?`)
|
var sqlRegexp = regexp.MustCompile(`(\$\d+)|\?`)
|
||||||
|
|
||||||
func (logger Logger) Print(values ...interface{}) {
|
func (logger Logger) Print(values ...interface{}) {
|
||||||
|
|
||||||
|
if gormLog := os.Getenv("GORM_LOG_ON"); gormLog != "" {
|
||||||
|
|
||||||
if len(values) > 1 {
|
if len(values) > 1 {
|
||||||
level := values[0]
|
level := values[0]
|
||||||
currentTime := "\n\033[33m[" + NowFunc().Format("2006-01-02 15:04:05") + "]\033[0m"
|
currentTime := "\n\033[33m[" + NowFunc().Format("2006-01-02 15:04:05") + "]\033[0m"
|
||||||
@ -64,4 +67,5 @@ func (logger Logger) Print(values ...interface{}) {
|
|||||||
}
|
}
|
||||||
logger.Println(messages...)
|
logger.Println(messages...)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
4
utils.go
4
utils.go
@ -3,6 +3,7 @@ package gorm
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Copied from golint
|
// Copied from golint
|
||||||
@ -18,6 +19,7 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var smap = map[string]string{}
|
var smap = map[string]string{}
|
||||||
|
var mutex = &sync.Mutex{}
|
||||||
|
|
||||||
func ToDBName(name string) string {
|
func ToDBName(name string) string {
|
||||||
if v, ok := smap[name]; ok {
|
if v, ok := smap[name]; ok {
|
||||||
@ -34,7 +36,9 @@ func ToDBName(name string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
s := strings.ToLower(buf.String())
|
s := strings.ToLower(buf.String())
|
||||||
|
mutex.Lock()
|
||||||
smap[name] = s
|
smap[name] = s
|
||||||
|
mutex.Unlock()
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user