From 799831c53803272b749940f301311aa8b712738a Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 18 Sep 2023 15:07:29 -0700 Subject: [PATCH 1/4] renaming --- go/cmd/dolt/commands/filter-branch.go | 2 +- go/cmd/dolt/commands/sql.go | 2 +- go/go.mod | 6 +++++- go/go.sum | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go/cmd/dolt/commands/filter-branch.go b/go/cmd/dolt/commands/filter-branch.go index 8d175b8aa9..dba801e6d0 100644 --- a/go/cmd/dolt/commands/filter-branch.go +++ b/go/cmd/dolt/commands/filter-branch.go @@ -231,7 +231,7 @@ func processFilterQuery(ctx context.Context, dEnv *env.DoltEnv, cm *doltdb.Commi _, itr, err = eng.Query(sqlCtx, query) case *sqlparser.DDL: _, itr, err = eng.Query(sqlCtx, query) - case *sqlparser.Select, *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.Union: + case *sqlparser.Select, *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.SetOp: return nil, fmt.Errorf("filter-branch queries must be write queries: '%s'", query) default: diff --git a/go/cmd/dolt/commands/sql.go b/go/cmd/dolt/commands/sql.go index 49882f7c1c..5f9e20ee08 100644 --- a/go/cmd/dolt/commands/sql.go +++ b/go/cmd/dolt/commands/sql.go @@ -648,7 +648,7 @@ func execBatchMode(ctx *sql.Context, qryist cli.Queryist, input io.Reader, conti if rowIter != nil { switch sqlStatement.(type) { case *sqlparser.Select, *sqlparser.Insert, *sqlparser.Update, *sqlparser.Delete, - *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.Union: + *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.SetOp: // For any statement that prints out result, print a newline to put the regular output on its own line if fileReadProg != nil { fileReadProg.printNewLineIfNeeded() diff --git a/go/go.mod b/go/go.mod index 079e2bb5ed..9f52d5a5b4 100644 --- a/go/go.mod +++ b/go/go.mod @@ -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-20230915082726-ef1b92774b14 + github.com/dolthub/vitess v0.0.0-20230918214702-61c0a2be3b09 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 @@ -160,4 +160,8 @@ require ( replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi +replace github.com/dolthub/go-mysql-server => ../../go-mysql-server + +replace github.com/dolthub/vitess => ../../vitess + go 1.19 diff --git a/go/go.sum b/go/go.sum index 31002e9228..9501999827 100644 --- a/go/go.sum +++ b/go/go.sum @@ -180,8 +180,6 @@ 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.20230915102538-dcfb1d7e60c7 h1:LldwLE/JWGNUvIkXFkurDzSgNXuQIASUzdykk2oqYSg= -github.com/dolthub/go-mysql-server v0.17.1-0.20230915102538-dcfb1d7e60c7/go.mod h1:s4hz5TZpFkw8IdLVz58EKKm9cxvRd4jVw1Hs2o+tEXw= 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= @@ -192,8 +190,6 @@ 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-20230915082726-ef1b92774b14 h1:w0MwDEgWWei13UqZeS6mlSPUQ3iMHMDlrU+MUKQtR4s= -github.com/dolthub/vitess v0.0.0-20230915082726-ef1b92774b14/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= From f15d16208d91f68bbaea832ae2ce8b7f3b36838d Mon Sep 17 00:00:00 2001 From: James Cor Date: Mon, 18 Sep 2023 15:45:05 -0700 Subject: [PATCH 2/4] replace --- go/go.mod | 4 ---- 1 file changed, 4 deletions(-) diff --git a/go/go.mod b/go/go.mod index 9f85b064c1..5e3d0e05e7 100644 --- a/go/go.mod +++ b/go/go.mod @@ -160,8 +160,4 @@ require ( replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi -replace github.com/dolthub/go-mysql-server => ../../go-mysql-server - -replace github.com/dolthub/vitess => ../../vitess - go 1.19 From 83079ef828f7ea70ef4e5b0eb27b0eb3d812fa7e Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 20 Sep 2023 11:39:02 -0700 Subject: [PATCH 3/4] bump --- go/go.mod | 4 ++-- go/go.sum | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go/go.mod b/go/go.mod index 1ae5d4d5f3..8495221284 100644 --- a/go/go.mod +++ b/go/go.mod @@ -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-20230915082726-ef1b92774b14 + github.com/dolthub/vitess v0.0.0-20230920000107-f381b0714e35 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.20230919172639-41921e74502c + github.com/dolthub/go-mysql-server v0.17.1-0.20230920182617-dd7450c028bb github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index fbd98527b2..4653b13e9e 100644 --- a/go/go.sum +++ b/go/go.sum @@ -180,11 +180,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= -<<<<<<< HEAD -======= -github.com/dolthub/go-mysql-server v0.17.1-0.20230919172639-41921e74502c h1:WWrDzivtwyxkXL/2AVxbwQaBnewlXbA1NSoHciswZuE= -github.com/dolthub/go-mysql-server v0.17.1-0.20230919172639-41921e74502c/go.mod h1:s4hz5TZpFkw8IdLVz58EKKm9cxvRd4jVw1Hs2o+tEXw= ->>>>>>> main +github.com/dolthub/go-mysql-server v0.17.1-0.20230920182617-dd7450c028bb h1:KMCaqPNWAS3i6DhHHYB44MKRA46VtDZZUp9TJqFmfrs= +github.com/dolthub/go-mysql-server v0.17.1-0.20230920182617-dd7450c028bb/go.mod h1:AIAn5YQYb8NyO4Sdgf7RW/Ih7DRChd5kAcow260NbAw= 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= @@ -195,6 +192,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-20230920000107-f381b0714e35 h1:LIfh8Uq3DJt8MS/cNC5aOYOQKmi5/SXt0zwhIS/9eRA= +github.com/dolthub/vitess v0.0.0-20230920000107-f381b0714e35/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= From 1c2939d3176288348471f49442730efc017f9253 Mon Sep 17 00:00:00 2001 From: James Cor Date: Wed, 20 Sep 2023 13:56:09 -0700 Subject: [PATCH 4/4] bump --- go/go.mod | 4 ++-- go/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go/go.mod b/go/go.mod index 8495221284..4afc5876e9 100644 --- a/go/go.mod +++ b/go/go.mod @@ -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-20230920000107-f381b0714e35 + github.com/dolthub/vitess v0.0.0-20230920190630-648c869b4af5 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.20230920182617-dd7450c028bb + github.com/dolthub/go-mysql-server v0.17.1-0.20230920193236-f6f51f8a84aa github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index 4653b13e9e..d1ad88daa9 100644 --- a/go/go.sum +++ b/go/go.sum @@ -180,8 +180,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.20230920182617-dd7450c028bb h1:KMCaqPNWAS3i6DhHHYB44MKRA46VtDZZUp9TJqFmfrs= -github.com/dolthub/go-mysql-server v0.17.1-0.20230920182617-dd7450c028bb/go.mod h1:AIAn5YQYb8NyO4Sdgf7RW/Ih7DRChd5kAcow260NbAw= +github.com/dolthub/go-mysql-server v0.17.1-0.20230920193236-f6f51f8a84aa h1:TRARXLwRp5vV5oVLF0lelfIvuEtJ3iqRDdBKlvkAjmM= +github.com/dolthub/go-mysql-server v0.17.1-0.20230920193236-f6f51f8a84aa/go.mod h1:Q4x3bXy1fzb7/HyhIXc35cXj0J7ETS6K0FwlbTNw9m4= 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= @@ -192,8 +192,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-20230920000107-f381b0714e35 h1:LIfh8Uq3DJt8MS/cNC5aOYOQKmi5/SXt0zwhIS/9eRA= -github.com/dolthub/vitess v0.0.0-20230920000107-f381b0714e35/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw= +github.com/dolthub/vitess v0.0.0-20230920190630-648c869b4af5 h1:RfDb0ycMTSPu+0dpJZSNZAiI3lanJR5IrHirEVP/CVg= +github.com/dolthub/vitess v0.0.0-20230920190630-648c869b4af5/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=