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

bug fixed

This commit is contained in:
Lunny Xiao 2015-10-27 15:41:13 +08:00
parent 81d7f834b1
commit a0e63df407
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
statement.go
View File

@ -913,7 +913,7 @@ func (statement *Statement) Desc(colNames ...string) *Statement {
fmt.Fprint(&buf, ", ") fmt.Fprint(&buf, ", ")
} }
newColNames := statement.col2NewColsWithQuote(colNames...) newColNames := statement.col2NewColsWithQuote(colNames...)
fmt.Fprintf(&buf, "%q DESC", strings.Join(newColNames, " DESC, ")) fmt.Fprintf(&buf, "%v DESC", strings.Join(newColNames, " DESC, "))
statement.OrderStr = buf.String() statement.OrderStr = buf.String()
return statement return statement
} }
@ -926,7 +926,7 @@ func (statement *Statement) Asc(colNames ...string) *Statement {
fmt.Fprint(&buf, ", ") fmt.Fprint(&buf, ", ")
} }
newColNames := statement.col2NewColsWithQuote(colNames...) newColNames := statement.col2NewColsWithQuote(colNames...)
fmt.Fprintf(&buf, "%q ASC", strings.Join(newColNames, " ASC, ")) fmt.Fprintf(&buf, "%v ASC", strings.Join(newColNames, " ASC, "))
statement.OrderStr = buf.String() statement.OrderStr = buf.String()
return statement return statement
} }
@ -935,7 +935,7 @@ func (statement *Statement) Asc(colNames ...string) *Statement {
func (statement *Statement) Join(join_operator string, tablename interface{}, condition string) *Statement { func (statement *Statement) Join(join_operator string, tablename interface{}, condition string) *Statement {
var buf bytes.Buffer var buf bytes.Buffer
if len(statement.JoinStr) > 0 { if len(statement.JoinStr) > 0 {
fmt.Fprintf(&buf, "%q %v JOIN ", statement.JoinStr, join_operator) fmt.Fprintf(&buf, "%v %v JOIN ", statement.JoinStr, join_operator)
} else { } else {
fmt.Fprintf(&buf, "%v JOIN ", join_operator) fmt.Fprintf(&buf, "%v JOIN ", join_operator)
} }
@ -944,7 +944,7 @@ func (statement *Statement) Join(join_operator string, tablename interface{}, co
case []string: case []string:
t := tablename.([]string) t := tablename.([]string)
if len(t) > 1 { if len(t) > 1 {
fmt.Fprintf(&buf, "%q AS %q", statement.Engine.Quote(t[0]), statement.Engine.Quote(t[1])) fmt.Fprintf(&buf, "%v AS %v", statement.Engine.Quote(t[0]), statement.Engine.Quote(t[1]))
} else if len(t) == 1 { } else if len(t) == 1 {
fmt.Fprintf(&buf, statement.Engine.Quote(t[0])) fmt.Fprintf(&buf, statement.Engine.Quote(t[0]))
} }
@ -964,7 +964,7 @@ func (statement *Statement) Join(join_operator string, tablename interface{}, co
} }
} }
if l > 1 { if l > 1 {
fmt.Fprintf(&buf, "%q AS %q", statement.Engine.Quote(table), fmt.Fprintf(&buf, "%v AS %v", statement.Engine.Quote(table),
statement.Engine.Quote(fmt.Sprintf("%v", t[1]))) statement.Engine.Quote(fmt.Sprintf("%v", t[1])))
} else if l == 1 { } else if l == 1 {
fmt.Fprintf(&buf, statement.Engine.Quote(table)) fmt.Fprintf(&buf, statement.Engine.Quote(table))