fix #74 [BREAKING CHANGE] Select#GroupBy and Select#OrderBy behavior …

…change. Previous, GroupBy and OrderBy only keep the columns in the last call. Now, all columns are kept.
huandu · Jun 23, 2022 · 0e6e16e · 0e6e16e
1 parent 153aee0
commit 0e6e16e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/go.mod b/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

diff --git a/injection.go b/injection.go
@@ -15,11 +15,6 @@ type injection struct {
 
 type injectionMarker int
 
-type injectedSQL struct {
-	marker injectionMarker
-	sql    string
-}
-
 // newInjection creates a new injection.
 func newInjection() *injection {
 	return &injection{

diff --git a/select.go b/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
 }

diff --git a/struct_test.go b/struct_test.go
@@ -245,7 +245,6 @@ func (db testDB) Query(query string, args ...interface{}) (testRows, error) {
 }
 
 func (db testDB) Exec(query string, args ...interface{}) {
-	return
 }
 
 func (rows testRows) Close() error {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     func (db testDB) Exec(query string, args ...interface{}) {
-    	return
     }
     func (rows testRows) Close() error {
@@ Expand Down @@