From 50fd7ee096669b5691deb57a267d8d1cf78746d9 Mon Sep 17 00:00:00 2001 From: Hydrocharged Date: Wed, 23 Nov 2022 03:03:15 +0000 Subject: [PATCH 1/2] [ga-bump-dep] Bump dependency in Dolt by Hydrocharged --- 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 0b543e161a..3d3384d2c0 100644 --- a/go/go.mod +++ b/go/go.mod @@ -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.20221122083400-0ba736613080 + github.com/dolthub/go-mysql-server v0.14.1-0.20221123030146-5f1008d63c1a 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 diff --git a/go/go.sum b/go/go.sum index 24bccbb46a..8b8b50109d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -162,8 +162,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.20221122083400-0ba736613080 h1:gPzF+rlUZB/GQzcPsSM/oOP3ijQMOHAfNLnqqKFGIH0= -github.com/dolthub/go-mysql-server v0.14.1-0.20221122083400-0ba736613080/go.mod h1:drVceZC7lt+ZRzd0LnS7o3CURk7xGDDfjbsDfTKR7O0= +github.com/dolthub/go-mysql-server v0.14.1-0.20221123030146-5f1008d63c1a h1:JBngpMUczXHoHtrPqYU9bCpRJ/yw2nTwze5fh3YJY6M= +github.com/dolthub/go-mysql-server v0.14.1-0.20221123030146-5f1008d63c1a/go.mod h1:drVceZC7lt+ZRzd0LnS7o3CURk7xGDDfjbsDfTKR7O0= github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g= github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms= github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8= From 8e7df34d775757003d65b177f0224d1aa2b160ea Mon Sep 17 00:00:00 2001 From: Daylon Wilkins Date: Wed, 23 Nov 2022 00:38:29 -0800 Subject: [PATCH 2/2] Fixed test error --- go/libraries/doltcore/sqle/sqlinsert_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/libraries/doltcore/sqle/sqlinsert_test.go b/go/libraries/doltcore/sqle/sqlinsert_test.go index 4bb908d4b1..fc26ac2251 100644 --- a/go/libraries/doltcore/sqle/sqlinsert_test.go +++ b/go/libraries/doltcore/sqle/sqlinsert_test.go @@ -316,7 +316,7 @@ var BasicInsertTests = []InsertTest{ SelectQuery: "select id, first_name, last_name, is_married, age, rating from people where id = 7 ORDER BY id", ExpectedRows: ToSqlRows( CompressSchema(SubsetSchema(PeopleTestSchema, "id", "first_name", "last_name", "is_married", "age", "rating")), - NewResultSetRow(types.Int(7), types.String("Maggie"), types.String("Simpson"), types.Int(0), types.Int(1), types.Float(5.1)), + NewResultSetRow(types.Int(7), types.String("Maggie"), types.String("Simpson"), types.Int(1), types.Int(1), types.Float(5.1)), ), ExpectedSchema: CompressSchema(SubsetSchema(PeopleTestSchema, "id", "first_name", "last_name", "is_married", "age", "rating")), },