Merge branch 'fulghum/undrop' into aaron/undrop-cluster-tests

This commit is contained in:
Jason Fulghum
2023-10-11 16:39:00 -07:00
committed by GitHub
4 changed files with 15 additions and 9 deletions
@@ -15,7 +15,7 @@ actorprefix="$5"
format="$6"
nomsBinFormat="$7"
precision="2"
precision="4"
if [ -n "$nomsBinFormat" ]; then
nomsBinFormat="\"--noms-bin-format=$nomsBinFormat\","
+2 -2
View File
@@ -15,7 +15,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20230929000236-6c60b48b32da
github.com/dolthub/vitess v0.0.0-20231010151643-9ebf1a784d37
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -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.17.1-0.20231005225621-4cc2f2ca38ce
github.com/dolthub/go-mysql-server v0.17.1-0.20231010213814-7dac0e540c1e
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
+4 -4
View File
@@ -181,8 +181,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.17.1-0.20231005225621-4cc2f2ca38ce h1:x27xw9s1Odf4MVCmjU8bqqOEY5wQY4YL18tOPUtJp1k=
github.com/dolthub/go-mysql-server v0.17.1-0.20231005225621-4cc2f2ca38ce/go.mod h1:KWMgEn//scUZuT8vHeHdMWrvCvcE7FrizZ0HKB08zrU=
github.com/dolthub/go-mysql-server v0.17.1-0.20231010213814-7dac0e540c1e h1:JjTl+ak6MD/FW74cmLX1tO3FAB0I5Py3/Wjva8WqAY0=
github.com/dolthub/go-mysql-server v0.17.1-0.20231010213814-7dac0e540c1e/go.mod h1:lThdmBcDr/gQM5liF2PqZl7U0yIEehuB3fCz8cSpJtk=
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=
@@ -193,8 +193,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc=
github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ=
github.com/dolthub/vitess v0.0.0-20230929000236-6c60b48b32da h1:QWw80StS0Sxn9UArlg8JE15Rka8g0Uz/nrIhC6K8PUA=
github.com/dolthub/vitess v0.0.0-20230929000236-6c60b48b32da/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
github.com/dolthub/vitess v0.0.0-20231010151643-9ebf1a784d37 h1:tFWZESxJqu04VcGzr3QqemUc3yHP5gbj2srBcbuMZ7s=
github.com/dolthub/vitess v0.0.0-20231010151643-9ebf1a784d37/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
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=
@@ -2345,7 +2345,10 @@ func TestQueriesPrepared(t *testing.T) {
func TestStatistics(t *testing.T) {
h := newDoltHarness(t)
defer h.Close()
enginetest.TestStatistics(t, h)
for _, script := range queries.StatisticsQueries {
h.engine = nil
enginetest.TestScript(t, h, script)
}
}
func TestSpatialQueriesPrepared(t *testing.T) {
@@ -2359,7 +2362,10 @@ func TestSpatialQueriesPrepared(t *testing.T) {
func TestPreparedStatistics(t *testing.T) {
h := newDoltHarness(t)
defer h.Close()
enginetest.TestStatisticsPrepared(t, h)
for _, script := range queries.StatisticsQueries {
h.engine = nil
enginetest.TestScriptPrepared(t, h, script)
}
}
func TestVersionedQueriesPrepared(t *testing.T) {