Merge pull request #9704 from dolthub/angela/groupby_bump

[no-release-notes] Make updates for new GroupBy validation in gms

Author: angelamayxie

go/go.mod

@@ -60,7 +60,7 @@ require (
 	github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12
 	github.com/dolthub/eventsapi_schema v0.0.0-20250725194025-a087efa1ee55
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20250820173946-c848ce92b781
+	github.com/dolthub/go-mysql-server v0.20.1-0.20250820200253-9b7555658e70
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/edsrzf/mmap-go v1.2.0
 	github.com/esote/minmaxheap v1.0.0

go/go.sum

@@ -213,8 +213,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
 github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
 github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f h1:oSA8CptGeCEdTdD9LFtv8x4juDfdaLKsx1eocyaj1bE=
 github.com/dolthub/go-icu-regex v0.0.0-20250820171420-f2b78f56ce9f/go.mod h1:kpsRG+a196Y69zsAFL0RkQICII9a571lcaxhvQnmrdY=
-github.com/dolthub/go-mysql-server v0.20.1-0.20250820173946-c848ce92b781 h1:8Rl+8HEI64HRXtML5cDRFwvRmZbN5lJhQb5B6rhQcaU=
-github.com/dolthub/go-mysql-server v0.20.1-0.20250820173946-c848ce92b781/go.mod h1:2kd3E7pEmjYEDBgdd0CtZGyXR/lvKC5RlDeTNHAV6VI=
+github.com/dolthub/go-mysql-server v0.20.1-0.20250820200253-9b7555658e70 h1:HHYHW6X0z5P8n5KHZMzu0+MS3ePD7zbhj5ucZ+vhoGc=
+github.com/dolthub/go-mysql-server v0.20.1-0.20250820200253-9b7555658e70/go.mod h1:2kd3E7pEmjYEDBgdd0CtZGyXR/lvKC5RlDeTNHAV6VI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=

go/libraries/doltcore/sqle/kvexec/builder.go

@@ -93,8 +93,8 @@ func (b Builder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (sql.RowIter, er
 			}
 		}
 	case *plan.GroupBy:
-		if len(n.GroupByExprs) == 0 && len(n.SelectedExprs) == 1 {
-			if cnt, ok := n.SelectedExprs[0].(*aggregation.Count); ok {
+		if len(n.GroupByExprs) == 0 && len(n.SelectDeps) == 1 {
+			if cnt, ok := n.SelectDeps[0].(*aggregation.Count); ok {
 				if _, _, srcIter, _, srcSchema, _, _, srcFilter, err := getSourceKv(ctx, n.Child, true); err == nil && srcSchema != nil && srcFilter == nil {
 					iter, ok, err := newCountAggregationKvIter(srcIter, srcSchema, cnt.Child)
 					if ok && err == nil {

integration-tests/bats/sql.bats

@@ -2157,7 +2157,7 @@ SQL
     [[ "$output" =~ " 5 " ]] || false
     [[ "$output" =~ " 0 " ]] || false
     [[ ! "$output" =~ " 4 " ]] || false
-    run dolt sql -r csv -q "select max(pk),c2 from one_pk group by c1"
+    run dolt sql -r csv -q "select max(pk),c2 from one_pk group by c2"
     [ $status -eq 0 ]
     [[ "$output" =~ "5,0" ]] || false
     [[ "$output" =~ "1,10" ]] || false

integration-tests/mysql-client-tests/node/workbenchTests/table.js

@@ -75,7 +75,7 @@ export const tableTests = [
     table_name, index_name, comment, non_unique, GROUP_CONCAT(column_name ORDER BY seq_in_index) AS COLUMNS 
   FROM information_schema.statistics 
   WHERE table_schema=:tableSchema AND table_name=:tableName AND index_name!="PRIMARY" 
-  GROUP BY index_name;`,
+  GROUP BY index_name, comment, non_unique;`,
     p: { tableSchema: `${dbName}/main`, tableName: "test" },
     res: [
       {