mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-24 11:39:03 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

Merge main

Browse Source
This commit is contained in:
Zach Musgrave
2023-06-07 09:02:30 -07:00
parent ab31d5c826 9692f6ef92
commit 6e7f27cd8f
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
Executable → Regular
+1 -1
View File
@@ -59,7 +59,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.15.1-0.20230606221209-a8f0e24fc48a
github.com/dolthub/go-mysql-server v0.15.1-0.20230606174340-20dde39da840
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
go/go.sum
Executable → Regular
+2 -2
View File
@@ -168,8 +168,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.15.1-0.20230606221209-a8f0e24fc48a h1:lE1ylBwSwC4up5VlExNNyNfXFnJci09RDdsh9lIXfxs=
github.com/dolthub/go-mysql-server v0.15.1-0.20230606221209-a8f0e24fc48a/go.mod h1:TP8QrAsULBEK7nP0BHRSfZ9l8oiAeaRzIREHVk2wnz0=
github.com/dolthub/go-mysql-server v0.15.1-0.20230606174340-20dde39da840 h1:LNrH1zxCioDcpTMkTV/cr3LI4AlyxrmILI17OUbijUU=
github.com/dolthub/go-mysql-server v0.15.1-0.20230606174340-20dde39da840/go.mod h1:TP8QrAsULBEK7nP0BHRSfZ9l8oiAeaRzIREHVk2wnz0=
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.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ=
go/libraries/doltcore/sqle/index/dolt_index.go
+4 -1
View File
@@ -1138,7 +1138,10 @@ func getRangeCutValue(cut sql.RangeCut, typ sql.Type) (interface{}, error) {
if _, ok := cut.(sql.AboveNull); ok {
return nil, nil
}
ret, _, err := typ.Convert(sql.GetRangeCutKey(cut))
ret, oob, err := typ.Convert(sql.GetRangeCutKey(cut))
if oob == sql.OutOfRange {
return ret, nil
}
return ret, err
}
integration-tests/bats/remotes-sql-server.bats
+3
View File
@@ -10,6 +10,9 @@ make_repo() {
}
setup() {
if [ "$SQL_ENGINE" = "remote-engine" ]; then
skip "This test tests remote connections directly, SQL_ENGINE is not needed."
fi
setup_no_dolt_init
make_repo repo1
mkdir rem1
integration-tests/bats/sql-server.bats
+3
View File
@@ -11,6 +11,9 @@ make_repo() {
setup() {
skiponwindows "tests are flaky on Windows"
if [ "$SQL_ENGINE" = "remote-engine" ]; then
skip "This test tests remote connections directly, SQL_ENGINE is not needed."
fi
setup_no_dolt_init
make_repo repo1
make_repo repo2