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

Merge branch 'mssqllimit' of github.com:go-xorm/xorm into mssqllimit

This commit is contained in:
Lunny Xiao 2014-05-06 14:27:25 +08:00
parent 171e989052 9347c8ab3e
commit 2ec214fcf8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mssql_dialect.go
View File

@ -211,6 +211,7 @@ INNER JOIN SYS.COLUMNS C ON IXS.OBJECT_ID=C.OBJECT_ID
AND IXCS.COLUMN_ID=C.COLUMN_ID AND IXCS.COLUMN_ID=C.COLUMN_ID
WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =? WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =?
` `
rows, err := db.DB().Query(s, args...) rows, err := db.DB().Query(s, args...)
if err != nil { if err != nil {
return nil, err return nil, err

10
statement.go
View File

@ -996,7 +996,9 @@ func (statement *Statement) genSelectSql(columnStr string) (a string) {
} }
if statement.Engine.dialect.DBType() == core.MSSQL { if statement.Engine.dialect.DBType() == core.MSSQL {
top = fmt.Sprintf(" TOP %d", statement.LimitN) if statement.LimitN > 0 {
top = fmt.Sprintf(" TOP %d ", statement.LimitN)
}
if statement.Start > 0 { if statement.Start > 0 {
var column string = "(id)" var column string = "(id)"
if len(statement.RefTable.PKColumns()) == 0 { if len(statement.RefTable.PKColumns()) == 0 {
@ -1019,7 +1021,11 @@ func (statement *Statement) genSelectSql(columnStr string) (a string) {
a = fmt.Sprintf("SELECT %v%v%v%v%v", top, distinct, columnStr, a = fmt.Sprintf("SELECT %v%v%v%v%v", top, distinct, columnStr,
fromStr, whereStr) fromStr, whereStr)
if mssqlCondi != "" { if mssqlCondi != "" {
a += " AND " + mssqlCondi if whereStr != "" {
a += " AND " + mssqlCondi
} else {
a += " WHERE " + mssqlCondi
}
} }
if statement.GroupByStr != "" { if statement.GroupByStr != "" {