diff --git a/go/go.mod b/go/go.mod index 47b3cb9952b..b8e3e162ff1 100644 --- a/go/go.mod +++ b/go/go.mod @@ -57,7 +57,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.18.1-0.20240307204542-24c903c3e26f + github.com/dolthub/go-mysql-server v0.18.1-0.20240308000522-3844dd850cca github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/go-github/v57 v57.0.0 diff --git a/go/go.sum b/go/go.sum index 3622c4eb2cf..120b9e2e4b7 100644 --- a/go/go.sum +++ b/go/go.sum @@ -183,8 +183,8 @@ 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-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168= -github.com/dolthub/go-mysql-server v0.18.1-0.20240307204542-24c903c3e26f h1:QPg3fY8reBnuonfe1bmrg3U0S1nGDZKi9W8AT2xaGhs= -github.com/dolthub/go-mysql-server v0.18.1-0.20240307204542-24c903c3e26f/go.mod h1:64WUMjm3CODyv+EJzLo9CYgBN1ZWiJ1AdRH/GP1AIw0= +github.com/dolthub/go-mysql-server v0.18.1-0.20240308000522-3844dd850cca h1:iYHTE9abjZoZzCtRM73rgtljkDHjlB6O/Oy4SbWjzCM= +github.com/dolthub/go-mysql-server v0.18.1-0.20240308000522-3844dd850cca/go.mod h1:64WUMjm3CODyv+EJzLo9CYgBN1ZWiJ1AdRH/GP1AIw0= 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.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ= diff --git a/go/libraries/doltcore/sqle/index/dolt_index.go b/go/libraries/doltcore/sqle/index/dolt_index.go index 54c6785d82d..a246d579c8a 100644 --- a/go/libraries/doltcore/sqle/index/dolt_index.go +++ b/go/libraries/doltcore/sqle/index/dolt_index.go @@ -1206,9 +1206,16 @@ func (di *doltIndex) prollyRangesFromSqlRanges(ctx context.Context, ns tree.Node if err = tree.PutField(ctx, ns, tb, i, nv); err != nil { return nil, err } + if vv, ok := v.([]byte); ok { + v = string(vv) + } + if nvv, ok := nv.([]byte); ok { + nv = string(nvv) + } + fields[i].Hi = prolly.Bound{ Binding: true, - Inclusive: bound == sql.Closed || nv != v, // TODO (james): this might panic for []byte + Inclusive: bound == sql.Closed || nv != v, } } else { fields[i].Hi = prolly.Bound{}