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

bug fixed: resolved #301

This commit is contained in:
Lunny Xiao 2015-10-26 16:34:04 +08:00
parent 1da71e850a
commit 1d3b0d699e
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
statement.go
View File

@ -1181,12 +1181,6 @@ func (statement *Statement) genCountSql(bean interface{}) (string, []interface{}
} }
func (statement *Statement) genSelectSql(columnStr string) (a string) { func (statement *Statement) genSelectSql(columnStr string) (a string) {
/*if statement.GroupByStr != "" {
if columnStr == "" {
columnStr = statement.Engine.Quote(strings.Replace(statement.GroupByStr, ",", statement.Engine.Quote(","), -1))
}
//statement.GroupByStr = columnStr
}*/
var distinct string var distinct string
if statement.IsDistinct { if statement.IsDistinct {
distinct = "DISTINCT " distinct = "DISTINCT "
@ -1195,16 +1189,17 @@ func (statement *Statement) genSelectSql(columnStr string) (a string) {
var dialect core.Dialect = statement.Engine.Dialect() var dialect core.Dialect = statement.Engine.Dialect()
var top string var top string
var mssqlCondi string var mssqlCondi string
/*var orderBy string
if statement.OrderStr != "" {
orderBy = fmt.Sprintf(" ORDER BY %v", statement.OrderStr)
}*/
statement.processIdParam() statement.processIdParam()
var whereStr string var whereStr string
if statement.WhereStr != "" { if statement.WhereStr != "" {
whereStr = fmt.Sprintf(" WHERE %v", statement.WhereStr)
if statement.ConditionStr != "" { if statement.ConditionStr != "" {
whereStr = fmt.Sprintf("%v %s %v", whereStr, dialect.AndStr(), whereStr = fmt.Sprintf(" WHERE (%v)", statement.WhereStr)
} else {
whereStr = fmt.Sprintf(" WHERE %v", statement.WhereStr)
}
if statement.ConditionStr != "" {
whereStr = fmt.Sprintf("%v %s (%v)", whereStr, dialect.AndStr(),
statement.ConditionStr) statement.ConditionStr)
} }
} else if statement.ConditionStr != "" { } else if statement.ConditionStr != "" {
@ -1284,7 +1279,7 @@ func (statement *Statement) genSelectSql(columnStr string) (a string) {
} }
} }
if statement.IsForUpdate { if statement.IsForUpdate {
a = dialect.ForUpdateSql(a) a = dialect.ForUpdateSql(a)
} }
return return