Skip to content

Commit f103cb5

Browse files
committed
Fixed select fot SQL Server
1 parent 687d9c7 commit f103cb5

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

db/sql/search.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,7 @@ func (b selectBuilder) sql(d dialect, c *db.SelectCtrl) (string, bool, error) {
370370
case db.CASSANDRA:
371371
limit = fmt.Sprintf("LIMIT %v", c.Page.Limit)
372372
case db.MSSQL:
373-
if order == "" {
374-
order = "ORDER BY id DESC"
375-
} else {
373+
if len(order) != 0 {
376374
limit = fmt.Sprintf("OFFSET %v ROWS FETCH NEXT %v ROWS ONLY", c.Page.Offset, c.Page.Limit)
377375
}
378376
default:
@@ -934,6 +932,9 @@ func (g *sqlGateway) Select(tableName string, sc *db.SelectCtrl) (db.Rows, error
934932

935933
var rows *sql.Rows
936934
rows, err = g.rw.queryContext(g.ctx, query)
935+
if err != nil {
936+
return nil, err
937+
}
937938

938939
if g.explain && g.explainLogger != nil {
939940
if err = logExplainResults(g.explainLogger, g.dialect.name(), rows, query); err != nil {

0 commit comments

Comments
 (0)