From 66ef7d7c1353bd843cd88485955d572841a3af59 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Fri, 13 Aug 2021 10:59:47 -0700 Subject: [PATCH 1/2] Upgrade gms --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index 443b11a296..a7f4c884b1 100644 --- a/go/go.mod +++ b/go/go.mod @@ -18,7 +18,7 @@ require ( github.com/denisbrodbeck/machineid v1.0.1 github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi v0.0.0-20201005193433-3ee972b1d078 github.com/dolthub/fslock v0.0.3 - github.com/dolthub/go-mysql-server v0.10.1-0.20210810011625-0ba40926cee0 + github.com/dolthub/go-mysql-server v0.10.1-0.20210813175144-607fd4aa91c0 github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 diff --git a/go/go.sum b/go/go.sum index cc16703ace..d983ebb06f 100644 --- a/go/go.sum +++ b/go/go.sum @@ -142,8 +142,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= 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.10.1-0.20210810011625-0ba40926cee0 h1:qDMr1/LmPQfVNve1Es4pRG2kqM7eei6lR5o6t44VIYA= -github.com/dolthub/go-mysql-server v0.10.1-0.20210810011625-0ba40926cee0/go.mod h1:cPg39xeFH8/+McnJxncb79SgUuREeIqR+eTvxE6OmXc= +github.com/dolthub/go-mysql-server v0.10.1-0.20210813175144-607fd4aa91c0 h1:m5F317MX4I3vfkYc9W84r85WR4B9R0HceLvOJ9acNsE= +github.com/dolthub/go-mysql-server v0.10.1-0.20210813175144-607fd4aa91c0/go.mod h1:cPg39xeFH8/+McnJxncb79SgUuREeIqR+eTvxE6OmXc= github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446 h1:0ol5pj+QlKUKAtqs1LiPM3ZJKs+rHPgLSsMXmhTrCAM= github.com/dolthub/ishell v0.0.0-20210205014355-16a4ce758446/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms= github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66 h1:WRPDbpJWEnPxPmiuOTndT+lUWUeGjx6eoNOK9O4tQQQ= From a65b0e54fcad9df47d4d9494bcc33084fbf7a0fd Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Fri, 13 Aug 2021 15:21:24 -0700 Subject: [PATCH 2/2] Fix bug in test setup --- go/libraries/doltcore/sqle/table_editor_test.go | 2 ++ go/libraries/doltcore/sqle/testutil.go | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go/libraries/doltcore/sqle/table_editor_test.go b/go/libraries/doltcore/sqle/table_editor_test.go index 844a52ece5..db2dbcf4d8 100644 --- a/go/libraries/doltcore/sqle/table_editor_test.go +++ b/go/libraries/doltcore/sqle/table_editor_test.go @@ -184,6 +184,8 @@ func TestTableEditor(t *testing.T) { root, err = db.GetRoot(ctx) require.NoError(t, err) + require.NoError(t, dEnv.UpdateWorkingRoot(context.Background(), root)) + actualRows, _, err := executeSelect(t, context.Background(), dEnv, root, test.selectQuery) require.NoError(t, err) diff --git a/go/libraries/doltcore/sqle/testutil.go b/go/libraries/doltcore/sqle/testutil.go index be91f0c12e..306897459e 100644 --- a/go/libraries/doltcore/sqle/testutil.go +++ b/go/libraries/doltcore/sqle/testutil.go @@ -112,16 +112,18 @@ func NewTestEngine(t *testing.T, dEnv *env.DoltEnv, ctx context.Context, db Data sqlCtx := NewTestSQLCtx(ctx) - _ = dsess.DSessFromSess(sqlCtx.Session).AddDB(sqlCtx, getDbState(t, db, dEnv)) - sqlCtx.SetCurrentDatabase(db.Name()) - err := db.SetRoot(sqlCtx, root) + err := dsess.DSessFromSess(sqlCtx.Session).AddDB(sqlCtx, getDbState(t, db, dEnv)) + if err != nil { + return nil, nil, err + } + sqlCtx.SetCurrentDatabase(db.Name()) + err = db.SetRoot(sqlCtx, root) if err != nil { return nil, nil, err } err = RegisterSchemaFragments(sqlCtx, db, root) - if err != nil { return nil, nil, err }