[no-release-notes] fix tests from insert id change (#8196)

dolthub · Aug 2, 2024 · c290ade · c290ade
1 parent 2dbb49c
commit c290ade
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/go/go.mod b/go/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.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.20240801201951-0a543f7cabef
+	github.com/dolthub/go-mysql-server v0.18.2-0.20240802195141-c31af05771a8
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/dolthub/swiss v0.1.0
 	github.com/goccy/go-json v0.10.2

diff --git a/go/go.sum b/go/go.sum
@@ -185,8 +185,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.20240801201951-0a543f7cabef h1:reJ/BdyoZdLtGxhnnizNJU/CXBPLlfVBs76ipsucT1I=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240801201951-0a543f7cabef/go.mod h1:IvXmiR+fvWQs27nNmp0XuTO7ze6j6ekrVkhWw+3qo2s=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240802195141-c31af05771a8 h1:Z/ZlQ/K+2Z4NWVu75YfpNxkCqL7+OvB+TKSVHHh719w=
+github.com/dolthub/go-mysql-server v0.18.2-0.20240802195141-c31af05771a8/go.mod h1:IvXmiR+fvWQs27nNmp0XuTO7ze6j6ekrVkhWw+3qo2s=
 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=

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go
@@ -255,7 +255,7 @@ end
 			{
 				Query: "insert into t values (1, 1);",
 				Expected: []sql.Row{
-					{gmstypes.OkResult{RowsAffected: 1, InsertID: 1}},
+					{gmstypes.OkResult{RowsAffected: 1, InsertID: 4}},
 				},
 			},
 			{

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go
@@ -5272,7 +5272,7 @@ var DoltAutoIncrementTests = []queries.ScriptTest{
 			},
 			{
 				Query:    "insert into t (a, b) values (100, 100)",
-				Expected: []sql.Row{{types.OkResult{RowsAffected: 1, InsertID: 100}}},
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 1, InsertID: 5}}},
 			},
 			{
 				Query:            "alter table t auto_increment = 50",
@@ -7227,7 +7227,7 @@ var DoltTempTableScripts = []queries.ScriptTest{
 			{
 				Query: "insert into t values (100), (1000)",
 				Expected: []sql.Row{
-					{types.OkResult{RowsAffected: 2, InsertID: 0x64}},
+					{types.OkResult{RowsAffected: 2, InsertID: 1}},
 				},
 			},
 			{

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
@@ -1684,7 +1684,7 @@ var MergeScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "INSERT INTO t VALUES (3,3),(NULL,6);",
-				Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 3}}},
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 6}}},
 			},
 			{
 				Query: "SELECT * FROM t ORDER BY pk;",
@@ -1720,7 +1720,7 @@ var MergeScripts = []queries.ScriptTest{
 			},
 			{
 				Query:    "INSERT INTO t VALUES (3,3),(NULL,7);",
-				Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 3}}},
+				Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 7}}},
 			},
 			{
 				Query: "SELECT * FROM t ORDER BY pk;",