[no-release-notes] unskipping tests and bumping (#7734)

dolthub · Apr 12, 2024 · 9362519 · 9362519
1 parent 7347327
commit 9362519
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/go/go.mod b/go/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/cespare/xxhash v1.1.0
 	github.com/creasty/defaults v1.6.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.18.2-0.20240410211425-99ab3349e053
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240412184654-bce49039f35d
 	github.com/dolthub/swiss v0.1.0
 	github.com/goccy/go-json v0.10.2
 	github.com/google/go-github/v57 v57.0.0

diff --git a/go/go.sum b/go/go.sum
@@ -183,8 +183,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-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
 github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240410211425-99ab3349e053 h1:xcQB4hDiZmv18CbOI1xdZTqA3wnSzT6wTqjY2dPK5Yw=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240410211425-99ab3349e053/go.mod h1:rGgyIF7piB2vGiggazdZNhg25GZ91+E/lWpmRKnY+oA=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240412184654-bce49039f35d h1:lGvAgi4GHzb6CYvikmxzOfxKYQTilx50d29exIh98Ms=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240412184654-bce49039f35d/go.mod h1:rGgyIF7piB2vGiggazdZNhg25GZ91+E/lWpmRKnY+oA=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
 github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go
@@ -17,6 +17,8 @@ package enginetest
 import (
 	"github.com/dolthub/go-mysql-server/enginetest/queries"
 	"github.com/dolthub/go-mysql-server/sql"
+
+	gmstypes "github.com/dolthub/go-mysql-server/sql/types"
 )
 
 var DoltProcedureTests = []queries.ScriptTest{
@@ -223,10 +225,7 @@ end
 			"create table t(a int primary key auto_increment, b int);",
 			"create table t2(a int primary key auto_increment, b int);",
 			"call dolt_commit('-Am', 'new table');",
-		},
-		Assertions: []queries.ScriptTestAssertion{
-			{
-				Query: `create trigger branch_trigger after insert on t for each row
+			`create trigger branch_trigger after insert on t for each row
 begin
   declare i int default 1;
 	commits: loop
@@ -251,23 +250,34 @@ begin
 	end loop commits;
 end
 `,
-				Skip:             true, // See https://github.com/dolthub/go-mysql-server/pull/2442
-				SkipResultsCheck: true,
-			},
-			{
-				Query:            "insert into t values (1, 1);",
-				Skip:             true,
-				SkipResultsCheck: true, // return value is a bit odd, needs investigation
-			},
-			{
-				Query:    "select name from dolt_branches order by 1",
-				Skip:     true,
-				Expected: []sql.Row{{"branch1"}, {"branch2"}, {"branch3"}, {"branch4"}, {"main"}},
-			},
+		},
+		Assertions: []queries.ScriptTestAssertion{
 			{
-				Query:    "select * from t2 order by 1",
-				Skip:     true,
-				Expected: []sql.Row{{1, 1}, {2, 2}, {3, 3}, {4, 4}},
+				Query: "insert into t values (1, 1);",
+				Expected: []sql.Row{
+					{gmstypes.OkResult{RowsAffected: 1, InsertID: 1}},
+				},
+			},
+			{
+				Query: "select name from dolt_branches order by 1",
+				Expected: []sql.Row{
+					{"branch1"},
+					{"branch2"},
+					{"branch3"},
+					{"branch4"},
+					{"main"},
+				},
+			},
+			{
+				// For some reason, calling stored procedures disables inserts
+				Skip:  true,
+				Query: "select * from t2 order by 1",
+				Expected: []sql.Row{
+					{1, 1},
+					{2, 2},
+					{3, 3},
+					{4, 4},
+				},
 			},
 		},
 	},