HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #482 from nemec784/equalNoCase2EqualFold 

Case insensitive string comparison using strings.EqualFold
This commit is contained in:
Lunny Xiao 2016-11-01 22:44:45 +08:00 committed by GitHub
parent 6e4cb7136a 42d389ec00
commit 2b4faaaeab
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpers.go
View File

@ -207,10 +207,6 @@ func isPKZero(pk core.PK) bool {
return false return false
} }
func equalNoCase(s1, s2 string) bool {
return strings.ToLower(s1) == strings.ToLower(s2)
}
func indexNoCase(s, sep string) int { func indexNoCase(s, sep string) int {
return strings.Index(strings.ToLower(s), strings.ToLower(sep)) return strings.Index(strings.ToLower(s), strings.ToLower(sep))
} }

10
session.go
View File

@ -2630,9 +2630,9 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value,
x, err = strconv.ParseInt(sdata, 16, 64) x, err = strconv.ParseInt(sdata, 16, 64)
} else if strings.HasPrefix(sdata, "0") { } else if strings.HasPrefix(sdata, "0") {
x, err = strconv.ParseInt(sdata, 8, 64) x, err = strconv.ParseInt(sdata, 8, 64)
} else if strings.ToLower(sdata) == "true" { } else if strings.EqualFold(sdata, "true") {
x = 1 x = 1
} else if strings.ToLower(sdata) == "false" { } else if strings.EqualFold(sdata, "false") {
x = 0 x = 0
} else { } else {
x, err = strconv.ParseInt(sdata, 10, 64) x, err = strconv.ParseInt(sdata, 10, 64)
@ -3964,7 +3964,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
var oriTable *core.Table var oriTable *core.Table
for _, tb := range tables { for _, tb := range tables {
if equalNoCase(tb.Name, tbName) { if strings.EqualFold(tb.Name, tbName) {
oriTable = tb oriTable = tb
break break
} }
@ -3989,7 +3989,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
for _, col := range table.Columns() { for _, col := range table.Columns() {
var oriCol *core.Column var oriCol *core.Column
for _, col2 := range oriTable.Columns() { for _, col2 := range oriTable.Columns() {
if equalNoCase(col.Name, col2.Name) { if strings.EqualFold(col.Name, col2.Name) {
oriCol = col2 oriCol = col2
break break
} }
@ -4117,7 +4117,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
for _, table := range tables { for _, table := range tables {
var oriTable *core.Table var oriTable *core.Table
for _, structTable := range structTables { for _, structTable := range structTables {
if equalNoCase(table.Name, session.tbNameNoSchema(structTable)) { if strings.EqualFold(table.Name, session.tbNameNoSchema(structTable)) {
oriTable = structTable oriTable = structTable
break break
} }