Skip to content

Commit a6ce239

Browse files
authored
Merge pull request #7729 from dolthub/nicktobey/disable-tests
[no-release-notes] Remove unused test and bump GMS version.
2 parents 77691dd + c3db612 commit a6ce239

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/cespare/xxhash v1.1.0
5858
github.com/creasty/defaults v1.6.0
5959
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
60-
github.com/dolthub/go-mysql-server v0.18.2-0.20240409224550-bfde35b66568
60+
github.com/dolthub/go-mysql-server v0.18.2-0.20240410074202-09d57d9841d3
6161
github.com/dolthub/swiss v0.1.0
6262
github.com/goccy/go-json v0.10.2
6363
github.com/google/go-github/v57 v57.0.0

go/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
183183
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
184184
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
185185
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
186-
github.com/dolthub/go-mysql-server v0.18.2-0.20240409224550-bfde35b66568 h1:H2VdUQThLeXRdfKma4Llh9YjB6Ba76twe9MvHlDj8NM=
187-
github.com/dolthub/go-mysql-server v0.18.2-0.20240409224550-bfde35b66568/go.mod h1:uTqIti1oPqKEUS9N1zcT43a/QQ8n0PuBdZUMZziBaGU=
186+
github.com/dolthub/go-mysql-server v0.18.2-0.20240410074202-09d57d9841d3 h1:i48WY1tLEbvbN4PWiozfC7CzuuOw9or4tZedIWwxWE0=
187+
github.com/dolthub/go-mysql-server v0.18.2-0.20240410074202-09d57d9841d3/go.mod h1:uTqIti1oPqKEUS9N1zcT43a/QQ8n0PuBdZUMZziBaGU=
188188
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
189189
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
190190
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=

go/libraries/doltcore/sqle/enginetest/dolt_procedure_queries.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,10 @@ end
223223
"create table t(a int primary key auto_increment, b int);",
224224
"create table t2(a int primary key auto_increment, b int);",
225225
"call dolt_commit('-Am', 'new table');",
226-
`create trigger branch_trigger after insert on t for each row
226+
},
227+
Assertions: []queries.ScriptTestAssertion{
228+
{
229+
Query: `create trigger branch_trigger after insert on t for each row
227230
begin
228231
declare i int default 1;
229232
commits: loop
@@ -248,8 +251,9 @@ begin
248251
end loop commits;
249252
end
250253
`,
251-
},
252-
Assertions: []queries.ScriptTestAssertion{
254+
Skip: true, // See https://github.com/dolthub/go-mysql-server/pull/2442
255+
SkipResultsCheck: true,
256+
},
253257
{
254258
Query: "insert into t values (1, 1);",
255259
Skip: true,

0 commit comments

Comments
 (0)