Merge pull request #2553 from dolthub/coffeegoddd-3f4d534c

[auto-bump] [no-release-notes] dependency by coffeegoddd

Author: fulghum

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v2 v2.0.3-0.20200518165714-d020e156310a
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20260401232748-7054d6ee44c2
+	github.com/dolthub/dolt/go v0.40.5-0.20260406233421-3f4d534cd221
 	github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20260401185725-86b06c8c4eb5
+	github.com/dolthub/go-mysql-server v0.20.1-0.20260401233004-2e528e34dd18
 	github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
 	github.com/dolthub/vitess v0.0.0-20260309181228-a99af9c518ab

go.sum

@@ -245,8 +245,8 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
 github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44=
 github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk=
-github.com/dolthub/dolt/go v0.40.5-0.20260401232748-7054d6ee44c2 h1:l3fywqKTYDBwWRs60xg1CQJOkwe0rk7sxVWeKzRA5dI=
-github.com/dolthub/dolt/go v0.40.5-0.20260401232748-7054d6ee44c2/go.mod h1:LR+2HkG3e3DwPHjdobC/x9BOvRrRvnNNmuUN3QblKpQ=
+github.com/dolthub/dolt/go v0.40.5-0.20260406233421-3f4d534cd221 h1:GNwgsupbOHSzReeEwMn/QBOeU+Mxaz+KND9zchOzZ3g=
+github.com/dolthub/dolt/go v0.40.5-0.20260406233421-3f4d534cd221/go.mod h1:t4nyMM8nzBe2o8/nFTZNoYTJZFQsUqpqBAazIZUdLRc=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 h1:JShhbqMw26nKx3pqqu/cFxOpzBkN+4elVhzuUfgDw2k=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
@@ -255,8 +255,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-20250916051405-78a38d478790 h1:zxMsH7RLiG+dlZ/y0LgJHTV26XoiSJcuWq+em6t6VVc=
 github.com/dolthub/go-icu-regex v0.0.0-20250916051405-78a38d478790/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260401185725-86b06c8c4eb5 h1:d0NAC/kv6U+Wwq+5gzrZ14H8kILLRNxq8Gswng7+RP8=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260401185725-86b06c8c4eb5/go.mod h1:SQws7iFFL5fNxjGbl6xyWNBz3DWTReGBegApANmnwhM=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260401233004-2e528e34dd18 h1:OGR1WW6k6gLSju6WR0gIZmg0yYIeel1pynoTyo6ZmRc=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260401233004-2e528e34dd18/go.mod h1:SQws7iFFL5fNxjGbl6xyWNBz3DWTReGBegApANmnwhM=
 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=

testing/go/dolt_functions_test.go

@@ -2267,8 +2267,9 @@ func TestDoltRevert(t *testing.T) {
 					Expected: []sql.Row{{34}},
 				},
 				{
-					Query:    "SELECT DOLT_REVERT('HEAD');",
-					Expected: []sql.Row{{"{0}"}},
+					// This returns a hash, so we need to take the consistent substring portion for testing
+					Query:    `SELECT substring(DOLT_REVERT('HEAD')::text, 34);`,
+					Expected: []sql.Row{{",0,0,0}"}},
 				},
 				{
 					Query:    `SELECT * FROM t_simple;`,

testing/go/enginetest/doltgres_engine_test.go

@@ -1275,8 +1275,10 @@ func TestDoltRebasePrepared(t *testing.T) {
 
 func TestDoltRevert(t *testing.T) {
 	h := newDoltgresServerHarness(t).WithSkippedQueries([]string{
-		"dolt_revert() respects dolt_ignore",                  // ERROR: INSERT: non-Doltgres type found in destination: text
-		"dolt_revert() automatically resolves some conflicts", // panic: interface conversion: sql.Type is types.VarCharType, not types.StringType
+		"dolt_revert() respects dolt_ignore",                     // ERROR: INSERT: non-Doltgres type found in destination: text
+		"dolt_revert() automatically resolves some conflicts",    // panic: interface conversion: sql.Type is types.VarCharType, not types.StringType
+		"select count(*) from dolt_log;",                         // Doltgres creates an additional commit that Dolt doesn't have
+		"dolt_revert() --continue: ignored table in working set", // ERROR: ASSIGNMENT_CAST: target is of type boolean but expression is of type integer: 1
 	})
 	denginetest.RunDoltRevertTests(t, h)
 }