From 5c04a411692731d26e198d48f646c1aea294893d Mon Sep 17 00:00:00 2001 From: angelamayxie Date: Thu, 4 Sep 2025 17:31:41 +0000 Subject: [PATCH 1/2] [ga-bump-dep] Bump dependency in Dolt by angelamayxie --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index d3fabcb4b3..88ed178c82 100644 --- a/go/go.mod +++ b/go/go.mod @@ -61,7 +61,7 @@ require ( github.com/dolthub/dolt-mcp v0.2.1-0.20250827202412-9d0f6e658fba 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.20250903220939-e37200c6eae2 + github.com/dolthub/go-mysql-server v0.20.1-0.20250904172950-d32c9ced3750 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 github.com/edsrzf/mmap-go v1.2.0 github.com/esote/minmaxheap v1.0.0 diff --git a/go/go.sum b/go/go.sum index f1a90c9ff0..9ec855a564 100644 --- a/go/go.sum +++ b/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.20250903220939-e37200c6eae2 h1:0eW+uwwiWEI+a/L0EMdPhYkIYde2u5e4/hIZDQGzqHs= -github.com/dolthub/go-mysql-server v0.20.1-0.20250903220939-e37200c6eae2/go.mod h1:ymoHIRZoZKO1EH9iUGcq4E6XyIpUaMgZz3ZPeWa828w= +github.com/dolthub/go-mysql-server v0.20.1-0.20250904172950-d32c9ced3750 h1:1jk3hlw6zTMfoSzUP4jjKClPmbYm9xvRYld4YxMRQH8= +github.com/dolthub/go-mysql-server v0.20.1-0.20250904172950-d32c9ced3750/go.mod h1:ymoHIRZoZKO1EH9iUGcq4E6XyIpUaMgZz3ZPeWa828w= 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= From d8840d7e0ca863236159f2c4990358abf2302f94 Mon Sep 17 00:00:00 2001 From: Angela Xie Date: Thu, 4 Sep 2025 11:13:55 -0700 Subject: [PATCH 2/2] fix tests --- go/libraries/doltcore/sqle/kvexec/count_agg_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/kvexec/count_agg_test.go b/go/libraries/doltcore/sqle/kvexec/count_agg_test.go index 96254e5f1a..7e80bf8b97 100644 --- a/go/libraries/doltcore/sqle/kvexec/count_agg_test.go +++ b/go/libraries/doltcore/sqle/kvexec/count_agg_test.go @@ -67,6 +67,7 @@ func TestCountAgg(t *testing.T) { name: "reject multi parameter", setup: []string{ "create table xy (x int primary key, y int, key y_idx(y))", + "SET SESSION sql_mode = REPLACE(@@SESSION.sql_mode, 'ONLY_FULL_GROUP_BY', '');", }, query: "select count(y), x from xy", doRowexec: false, @@ -84,7 +85,7 @@ func TestCountAgg(t *testing.T) { setup: []string{ "create table xy (x int primary key, y int, key y_idx(y))", }, - query: "select count(y+1), x from xy", + query: "select count(y+1) from xy", doRowexec: false, }, }