mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1256 from fobispo-link/master 

Issue  #1249 fix - replacing $ placeholders in order when logging
This commit is contained in:
Jinzhu 2017-01-15 16:03:52 +08:00 committed by GitHub
parent 1aa2d4ca89 7f328975cd
commit 2c025b25fe
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
logger.go
View File

@ -13,7 +13,8 @@ import (
var ( var (
defaultLogger = Logger{log.New(os.Stdout, "\r\n", 0)} defaultLogger = Logger{log.New(os.Stdout, "\r\n", 0)}
sqlRegexp = regexp.MustCompile(`(\$\d+)|\?`) sqlRegexp = regexp.MustCompile(`\?`)
numericPlaceHolderRegexp = regexp.MustCompile(`\$\d+`)
) )
type logger interface { type logger interface {
@ -71,6 +72,15 @@ func (logger Logger) Print(values ...interface{}) {
} }
} }
// differentiate between $n placeholders or else treat like ?
if numericPlaceHolderRegexp.MatchString(values[3].(string)) {
sql = values[3].(string)
for index, value := range formattedValues {
placeholder := fmt.Sprintf(`\$%d`, index+1)
subre := regexp.MustCompile(placeholder)
sql = subre.ReplaceAllString(sql, value)
}
} else {
var formattedValuesLength = len(formattedValues) var formattedValuesLength = len(formattedValues)
for index, value := range sqlRegexp.Split(values[3].(string), -1) { for index, value := range sqlRegexp.Split(values[3].(string), -1) {
sql += value sql += value
@ -78,6 +88,7 @@ func (logger Logger) Print(values ...interface{}) {
sql += formattedValues[index] sql += formattedValues[index]
} }
} }
}
messages = append(messages, sql) messages = append(messages, sql)
} else { } else {