Skip to content

Fix InsertID discrepancy tests #8970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jycor merged 4 commits into from
Mar 11, 2025
Merged

Fix InsertID discrepancy tests #8970

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02747b2
fixing tests
Mar 11, 2025
4f59298
bump
Mar 11, 2025
b6ea658
bump
Mar 11, 2025
bdb46a8
bump
Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require (
github.com/creasty/defaults v1.6.0
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.19.1-0.20250311182803-be58f51fcf45
github.com/dolthub/go-mysql-server v0.19.1-0.20250311200900-6a818ea2c8ea
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/esote/minmaxheap v1.0.0
github.com/goccy/go-json v0.10.2
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,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-20250303123116-549b8d7cad00 h1:rh2ij2yTYKJWlX+c8XRg4H5OzqPewbU1lPK8pcfVmx8=
github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
github.com/dolthub/go-mysql-server v0.19.1-0.20250311182803-be58f51fcf45 h1:944d0+MCEZ6y6ZFZTRq6TWyr6oQeUsmd/dx6E3VeLFs=
github.com/dolthub/go-mysql-server v0.19.1-0.20250311182803-be58f51fcf45/go.mod h1:yr+Vv47/YLOKMgiEY+QxHTlbIVpTuiVtkEZ5l+xruY4=
github.com/dolthub/go-mysql-server v0.19.1-0.20250311200900-6a818ea2c8ea h1:60jk+AEkwAY5xQlV4rPW+/5xaDje5WiwKh0PHSD0OrE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250311200900-6a818ea2c8ea/go.mod h1:yr+Vv47/YLOKMgiEY+QxHTlbIVpTuiVtkEZ5l+xruY4=
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=
Expand Down
1 change: 1 addition & 0 deletions go/go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a h1:pv34s756C4pEXnjgPfGYgdhg/ZdajGhyOvzx8k+23nw=
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aws/aws-lambda-go v1.13.3 h1:SuCy7H3NLyp+1Mrfp+m80jcbi9KYWAs9/BXwppwRDzY=
github.com/aws/aws-sdk-go v1.30.19 h1:vRwsYgbUvC25Cb3oKXTyTYk3R5n1LRVk8zbvL4inWsc=
github.com/aws/aws-sdk-go-v2 v1.7.1 h1:TswSc7KNqZ/K1Ijt3IkpXk/2+62vi3Q82Yrr5wSbRBQ=
github.com/aws/aws-sdk-go-v2 v1.25.3/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.1/go.mod h1:sxpLb+nZk7tIfCWChfd+h4QwHNUR57d8hA1cleTkjJo=
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ end
{
Query: "insert into t values (1, 1);",
Expected: []sql.Row{
{gmstypes.OkResult{RowsAffected: 1, InsertID: 4}},
{gmstypes.OkResult{RowsAffected: 1, InsertID: 1}},
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5566,7 +5566,7 @@ var DoltAutoIncrementTests = []queries.ScriptTest{
},
{
Query: "insert into t (a, b) values (100, 100)",
Expected: []sql.Row{{types.OkResult{RowsAffected: 1, InsertID: 5}}},
Expected: []sql.Row{{types.OkResult{RowsAffected: 1, InsertID: 100}}},
},
{
Query: "alter table t auto_increment = 50",
Expand Down Expand Up @@ -7624,7 +7624,7 @@ var DoltTempTableScripts = []queries.ScriptTest{
{
Query: "insert into t values (100), (1000)",
Expected: []sql.Row{
{types.OkResult{RowsAffected: 2, InsertID: 1}},
{types.OkResult{RowsAffected: 2, InsertID: 100}},
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,7 +1734,7 @@ var MergeScripts = []queries.ScriptTest{
},
{
Query: "INSERT INTO t VALUES (3,3),(NULL,6);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 6}}},
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 3}}},
},
{
Query: "SELECT * FROM t ORDER BY pk;",
Expand Down Expand Up @@ -1770,7 +1770,7 @@ var MergeScripts = []queries.ScriptTest{
},
{
Query: "INSERT INTO t VALUES (3,3),(NULL,7);",
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 7}}},
Expected: []sql.Row{{types.OkResult{RowsAffected: 2, InsertID: 3}}},
},
{
Query: "SELECT * FROM t ORDER BY pk;",
Expand Down