Skip to content

Commit

Permalink
Merge pull request #8007 from dolthub/nicktobey-80599690
Browse files Browse the repository at this point in the history 
[auto-bump] [no-release-notes] dependency by nicktobey
  • Loading branch information
@nicktobey
nicktobey authored Jun 12, 2024
2 parents 0ff6bd3 + ecf3707 commit 50c8383
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion go/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.20240611203600-bf30a2a83b27
github.com/dolthub/go-mysql-server v0.18.2-0.20240612011212-805996901bb6
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.20240611203600-bf30a2a83b27 h1:ItQwXhGRwO/X+RUFfJ2DlvGJ1+/Zeonm7kddfWFbQ90=
github.com/dolthub/go-mysql-server v0.18.2-0.20240611203600-bf30a2a83b27/go.mod h1:GT7JcQavIf7bAO17/odujkgHM/N0t4b1HfAPBJ2jzXo=
github.com/dolthub/go-mysql-server v0.18.2-0.20240612011212-805996901bb6 h1:fn4Da0b7eYqfQojRblksdrTVx6UIQ7wDkn5Lno78krc=
github.com/dolthub/go-mysql-server v0.18.2-0.20240612011212-805996901bb6/go.mod h1:GT7JcQavIf7bAO17/odujkgHM/N0t4b1HfAPBJ2jzXo=
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-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
Expand Down
6 changes: 3 additions & 3 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries_merge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ var MergeScripts = []queries.ScriptTest{
{
Query: "SELECT from_root_ish, violation_type, hex(dolt_row_hash), aColumn, bColumn, CAST(violation_info as CHAR) FROM dolt_constraint_violations_aTable;",
Expected: []sql.Row{
{doltCommit, "unique index", "5A1ED8633E1842FCA8EE529E4F1C5944", 1, 2, `{"Columns":["aColumn"],"Name":"aColumn_UNIQUE"}`},
{doltCommit, "unique index", "A922BFBF4E5489501A3808BC5CD702C0", 1, 3, `{"Columns":["aColumn"],"Name":"aColumn_UNIQUE"}`},
{doltCommit, "unique index", "5A1ED8633E1842FCA8EE529E4F1C5944", 1, 2, `{"Name": "aColumn_UNIQUE", "Columns": ["aColumn"]}`},
{doltCommit, "unique index", "A922BFBF4E5489501A3808BC5CD702C0", 1, 3, `{"Name": "aColumn_UNIQUE", "Columns": ["aColumn"]}`},
},
},
{
Expand Down Expand Up @@ -176,7 +176,7 @@ var MergeScripts = []queries.ScriptTest{
{
Query: "SELECT from_root_ish, violation_type, hex(dolt_row_hash), aColumn, bColumn, CAST(violation_info as CHAR) FROM dolt_constraint_violations_aTable;",
Expected: []sql.Row{
{doltCommit, "foreign key", "13F8480978D0556FA9AE6DF5745A7ACA", 2, -1, `{"Columns":["bColumn"],"ForeignKey":"atable_ibfk_1","Index":"bColumn","OnDelete":"RESTRICT","OnUpdate":"RESTRICT","ReferencedColumns":["pk"],"ReferencedIndex":"","ReferencedTable":"parent","Table":"aTable"}`},
{doltCommit, "foreign key", "13F8480978D0556FA9AE6DF5745A7ACA", 2, -1, `{"Index": "bColumn", "Table": "aTable", "Columns": ["bColumn"], "OnDelete": "RESTRICT", "OnUpdate": "RESTRICT", "ForeignKey": "atable_ibfk_1", "ReferencedIndex": "", "ReferencedTable": "parent", "ReferencedColumns": ["pk"]}`},
},
},
{
Expand Down
48 changes: 24 additions & 24 deletions go/libraries/doltcore/sqle/enginetest/dolt_queries_verify_constraints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
{
Expand All @@ -373,8 +373,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
},
Expand Down Expand Up @@ -402,8 +402,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
{
Expand All @@ -427,8 +427,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
},
Expand All @@ -453,8 +453,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
{
Expand All @@ -473,8 +473,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
},
Expand All @@ -499,8 +499,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
{
Expand Down Expand Up @@ -542,8 +542,8 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"unique index", 1, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 2, 1, `{"Columns":["col1"],"Name":"col1"}`},
{"unique index", 1, 1, `{"Name": "col1", "Columns": ["col1"]}`},
{"unique index", 2, 1, `{"Name": "col1", "Columns": ["col1"]}`},
},
},
{
Expand Down Expand Up @@ -589,7 +589,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
{
Expand All @@ -608,7 +608,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
},
Expand Down Expand Up @@ -636,7 +636,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
{
Expand All @@ -660,7 +660,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
},
Expand All @@ -685,7 +685,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
{
Expand All @@ -704,7 +704,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
},
Expand All @@ -729,7 +729,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
{
Expand Down Expand Up @@ -771,7 +771,7 @@ var DoltVerifyConstraintsTestScripts = []queries.ScriptTest{
{
Query: "select violation_type, pk, col1, cast(violation_info as char) as violation_info from dolt_constraint_violations_t;",
Expected: []sql.Row{
{"check constraint", 1, 42, `{"Expression":"(NOT((col1 = col2)))","Name":"t_chk_5eebhnk4"}`},
{"check constraint", 1, 42, `{"Name": "t_chk_5eebhnk4", "Expression": "(NOT((col1 = col2)))"}`},
},
},
{
Expand Down

0 comments on commit 50c8383

Please sign in to comment.