mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-30 03:26:47 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

Merge pull request #5297 from dolthub/zachmu/enginetest-cleanup

Browse Source 
[no-release-notes] engine tests changes from GMS cleanup
This commit is contained in:
Zach Musgrave
2023-02-03 11:01:12 -08:00
committed by GitHub
parent 21a8025ee7 b954c2593e
commit 11325bb4b6
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+1 -1
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.20230202214904-d8078b5023fa
github.com/dolthub/go-mysql-server v0.14.1-0.20230203182436-2dac5eaba602
github.com/google/flatbuffers v2.0.6+incompatible
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
github.com/mitchellh/go-ps v1.0.0
go/go.sum
+2 -2
View File
@@ -161,8 +161,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.20230202214904-d8078b5023fa h1:UU6d1FzkVbGlbub1TF5YSmoJ+CiGGlvL5h7d+d4+10M=
github.com/dolthub/go-mysql-server v0.14.1-0.20230202214904-d8078b5023fa/go.mod h1:ZQfmjFs5Gk5WrMeOIE5qZWdWt6Z12kt7K5aVNho+XhY=
github.com/dolthub/go-mysql-server v0.14.1-0.20230203182436-2dac5eaba602 h1:2tKO9mNuquQNmpcqFm4YhE6vyQR5/2bepkxUZnW1X9w=
github.com/dolthub/go-mysql-server v0.14.1-0.20230203182436-2dac5eaba602/go.mod h1:aVtgxAf6Bfs0hCj+KzIH7Y1aAxg7/7FlslouCh94VVQ=
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=
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+1 -1
View File
@@ -793,7 +793,7 @@ func TestDoltRevisionDbScripts(t *testing.T) {
{"insert into t01 values (3, 3);"},
{"call dolt_commit('-am', 'adding another row to table t01 on main');"},
}
_, err = enginetest.RunEngineScripts(ctx, harness.engine, setupScripts, true)
_, err = enginetest.RunSetupScripts(ctx, harness.engine, setupScripts, true)
require.NoError(t, err)
sch, iter, err := harness.engine.Query(ctx, "select hashof('HEAD~2');")
go/libraries/doltcore/sqle/enginetest/dolt_harness.go
+3 -3
View File
@@ -176,7 +176,7 @@ func (d *DoltHarness) NewEngine(t *testing.T) (*gms.Engine, error) {
)
require.NoError(t, err)
e, err := enginetest.NewEngineWithProviderSetup(t, d, d.setupData)
e, err := enginetest.NewEngine(t, d, d.provider, d.setupData)
if err != nil {
return nil, err
}
@@ -190,7 +190,7 @@ func (d *DoltHarness) NewEngine(t *testing.T) (*gms.Engine, error) {
}
if !d.skipSetupCommit {
e, err = enginetest.RunEngineScripts(ctx, e, commitScripts(dbs), d.SupportsNativeIndexCreation())
e, err = enginetest.RunSetupScripts(ctx, e, commitScripts(dbs), d.SupportsNativeIndexCreation())
if err != nil {
return nil, err
}
@@ -204,7 +204,7 @@ func (d *DoltHarness) NewEngine(t *testing.T) (*gms.Engine, error) {
d.engine.Analyzer.Catalog.MySQLDb.AddRootAccount()
ctx := enginetest.NewContext(d)
e, err := enginetest.RunEngineScripts(ctx, d.engine, d.resetScripts(), d.SupportsNativeIndexCreation())
e, err := enginetest.RunSetupScripts(ctx, d.engine, d.resetScripts(), d.SupportsNativeIndexCreation())
return e, err
}