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

bump gms and jsonagg (#1408)

Browse Source 
Bump go-mysql-server to expose jsonagg.
This commit is contained in:
Vinai Rachakonda
2021-03-09 09:03:14 -05:00
committed by GitHub
parent 4a56d95208
commit 99140daeff
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+2 -2
View File
@@ -18,11 +18,11 @@ 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.2
github.com/dolthub/go-mysql-server v0.8.1-0.20210303053012-01d3dd8974b5
github.com/dolthub/go-mysql-server v0.8.1-0.20210309004624-52301a405ca7
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-20201105013724-5123fc66e12c
github.com/dolthub/vitess v0.0.0-20210302111926-4e2a3932adea
github.com/dolthub/vitess v0.0.0-20210306002241-df17fc5cd13d
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.9.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
go/go.sum
+4 -12
View File
@@ -148,24 +148,16 @@ 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.2 h1:8vUh47iKovgrtXNrXVIzsIoWLlspoXg+3nslhUzgKSw=
github.com/dolthub/fslock v0.0.2/go.mod h1:0i7bsNkK+XHwFL3dIsSWeXSV7sykVzzVr6+jq8oeEo0=
github.com/dolthub/go-mysql-server v0.8.1-0.20210301185422-c8a395d5b370 h1:C7hkb/Ui4ayhhsHcuABtQv4GOw5purjnG7kQBHgr2Ew=
github.com/dolthub/go-mysql-server v0.8.1-0.20210301185422-c8a395d5b370/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg=
github.com/dolthub/go-mysql-server v0.8.1-0.20210302215002-f6bd31ceb605 h1:w9OBtRy0SIS5twoQxums2HaR6QRgC5YPWr8XpUi7kVw=
github.com/dolthub/go-mysql-server v0.8.1-0.20210302215002-f6bd31ceb605/go.mod h1:L0qJ2mvtGNWMwQZ+hsefCyi6D++emk2TI/KupbVNCHg=
github.com/dolthub/go-mysql-server v0.8.1-0.20210302123814-70a75483543d h1:/12shYx2n5viswIxRyyvRZ2iVX6SWExSEs89M1B0jJk=
github.com/dolthub/go-mysql-server v0.8.1-0.20210302123814-70a75483543d/go.mod h1:iHMd5sa9Rkc7x60k4TQ3oGRmx94xYHB7O39hZUTfGNo=
github.com/dolthub/go-mysql-server v0.8.1-0.20210303053012-01d3dd8974b5 h1:hp6KeOKK/kF5verBdhvwOtp7298klkJsg7JyQl43fE0=
github.com/dolthub/go-mysql-server v0.8.1-0.20210303053012-01d3dd8974b5/go.mod h1:iHMd5sa9Rkc7x60k4TQ3oGRmx94xYHB7O39hZUTfGNo=
github.com/dolthub/go-mysql-server v0.8.1-0.20210309004624-52301a405ca7 h1:wXGcLyEL1fpd+0k5xK489LTTB3DUsy74zomeDL3i/0I=
github.com/dolthub/go-mysql-server v0.8.1-0.20210309004624-52301a405ca7/go.mod h1:WjNGQ7bj8F/x/d6gj2y5L52CTL08LkhazvO1Mbue43w=
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=
github.com/dolthub/mmap-go v1.0.4-0.20201107010347-f9f2a9588a66/go.mod h1:N5ZIbMGuDUpTpOFQ7HcsN6WSIpTGQjHP+Mz27AfmAgk=
github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c h1:ZIo6IOXU3/rJK4lp83QRq1zGhQrjQQtlmE2b7H1Vv/k=
github.com/dolthub/sqllogictest/go v0.0.0-20201105013724-5123fc66e12c/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/vitess v0.0.0-20210218042642-d99ce5b7b004 h1:q0eAoMtzoMShK2tzCYSISEfoIgOWtIOaNvlnC+lFQCE=
github.com/dolthub/vitess v0.0.0-20210218042642-d99ce5b7b004/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM=
github.com/dolthub/vitess v0.0.0-20210302111926-4e2a3932adea h1:4bW58K3O9WXfBXLLAFdxj9CzcRPFFENp9x8ZRCpz4AE=
github.com/dolthub/vitess v0.0.0-20210302111926-4e2a3932adea/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM=
github.com/dolthub/vitess v0.0.0-20210306002241-df17fc5cd13d h1:PhfTuYvjE+JMMX+Z/lDpGSAiRKTKL9HqDBwAd+UnyiM=
github.com/dolthub/vitess v0.0.0-20210306002241-df17fc5cd13d/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
go/libraries/doltcore/sqle/enginetest/dolt_harness.go
+2 -1
View File
@@ -68,7 +68,8 @@ func (d *DoltHarness) SkipQueryTest(query string) bool {
return strings.Contains(lowerQuery, "typestable") || // we don't support all the required types
lowerQuery == "show variables" || // we set extra variables
strings.Contains(lowerQuery, "show create table fk_tbl") || // we create an extra key for the FK that vanilla gms does not
strings.Contains(lowerQuery, "show indexes from") // we create / expose extra indexes (for foreign keys)
strings.Contains(lowerQuery, "show indexes from") || // we create / expose extra indexes (for foreign keys)
strings.Contains(lowerQuery, "json_arrayagg")
}
func (d *DoltHarness) Parallelism() int {