mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-28 10:46:21 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

Merge remote-tracking branch 'origin/main' into andy/journal-index

Browse Source
This commit is contained in:
Andy Arthur
2023-02-24 09:49:04 -08:00
parent b52e136e1b 357032354d
commit ed58ee1028
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/go.mod
View File

@@ -58,7 +58,7 @@ require (
github.com/cenkalti/backoff/v4 v4.1.3
github.com/cespare/xxhash v1.1.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/go-mysql-server v0.14.1-0.20230223182138-1540b5e80b39
github.com/dolthub/go-mysql-server v0.14.1-0.20230224003957-abbe846042ce
github.com/google/flatbuffers v2.0.6+incompatible
github.com/jmoiron/sqlx v1.3.4
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6

4
go/go.sum
View File

@@ -166,8 +166,8 @@ github.com/dolthub/flatbuffers v1.13.0-dh.1 h1:OWJdaPep22N52O/0xsUevxJ6Qfw1M2txC
github.com/dolthub/flatbuffers v1.13.0-dh.1/go.mod h1:CorYGaDmXjHz1Z7i50PYXG1Ricn31GcA2wNOTFIQAKE=
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-mysql-server v0.14.1-0.20230223182138-1540b5e80b39 h1:WkOLmXm/W68wK6Ei6i1bn21DSdNoATSqldKlSZqYtCg=
github.com/dolthub/go-mysql-server v0.14.1-0.20230223182138-1540b5e80b39/go.mod h1:I2Mu8LSpwUII53EyBXqJMEKTQH5DUetV4ulP88JVsKA=
github.com/dolthub/go-mysql-server v0.14.1-0.20230224003957-abbe846042ce h1:os05/y15ALxEVHU8a5FaBRbw1TVXYrzRR9jXmA7Dk/Y=
github.com/dolthub/go-mysql-server v0.14.1-0.20230224003957-abbe846042ce/go.mod h1:BRFyf6PUuoR+iSLZ+JdpjtqgHzo5cT+tF7oHIpVdytY=
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.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=

2
go/libraries/doltcore/sqle/enginetest/dolt_harness.go
View File

@@ -104,6 +104,7 @@ func (d *DoltHarness) resetScripts() []setup.SetupScript {
}
var resetCmds []setup.SetupScript
resetCmds = append(resetCmds, setup.SetupScript{"SET foreign_key_checks=0;"})
for i := range dbs {
db := dbs[i]
resetCmds = append(resetCmds, setup.SetupScript{fmt.Sprintf("use %s", db)})
@@ -138,6 +139,7 @@ func (d *DoltHarness) resetScripts() []setup.SetupScript {
resetCmds = append(resetCmds, setup.SetupScript{"call dreset('--hard', 'head')"})
}
resetCmds = append(resetCmds, setup.SetupScript{"SET foreign_key_checks=1;"})
resetCmds = append(resetCmds, setup.SetupScript{"use mydb"})
return resetCmds
}