merge

Author: huandu

go.mod

@@ -1,6 +1,6 @@
 module github.com/huandu/go-sqlbuilder
 
-go 1.12
+go 1.13
 
 require (
 	github.com/huandu/go-assert v1.1.5

select.go

@@ -153,14 +153,14 @@ func (sb *SelectBuilder) Having(andExpr ...string) *SelectBuilder {
 
 // GroupBy sets columns of GROUP BY in SELECT.
 func (sb *SelectBuilder) GroupBy(col ...string) *SelectBuilder {
-	sb.groupByCols = col
+	sb.groupByCols = append(sb.groupByCols, col...)
 	sb.marker = selectMarkerAfterGroupBy
 	return sb
 }
 
 // OrderBy sets columns of ORDER BY in SELECT.
 func (sb *SelectBuilder) OrderBy(col ...string) *SelectBuilder {
-	sb.orderByCols = col
+	sb.orderByCols = append(sb.orderByCols, col...)
 	sb.marker = selectMarkerAfterOrderBy
 	return sb
 }

struct_test.go

@@ -244,8 +244,7 @@ func (db testDB) Query(string, ...interface{}) (testRows, error) {
 	return 0, nil
 }
 
-func (db testDB) Exec(string, ...interface{}) {
-	return
+func (db testDB) Exec(query string, args ...interface{}) {
 }
 
 func (rows testRows) Close() error {