From 09916c80e2a5941c17845eddfdb4a5cb7a5cd09b Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Thu, 17 Oct 2024 15:46:09 +0800 Subject: [PATCH] fix: revert temp fix for quoted charset (#97) --- backend/handler.go | 3 --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/handler.go b/backend/handler.go index 6136e746..08339a04 100644 --- a/backend/handler.go +++ b/backend/handler.go @@ -17,7 +17,6 @@ package backend import ( "context" "fmt" - "strings" "github.com/dolthub/go-mysql-server/server" "github.com/dolthub/vitess/go/mysql" @@ -49,8 +48,6 @@ func (h *MyHandler) ComQuery( query string, callback mysql.ResultSpoolFn, ) error { - // https://github.com/dolthub/dolt/issues/8455 - query = strings.ReplaceAll(query, "CHARACTER SET 'utf8mb4'", "CHARACTER SET utf8mb4") return h.Handler.ComQuery(ctx, c, query, callback) } diff --git a/go.mod b/go.mod index 38926c5e..ec1116df 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/Shopify/toxiproxy/v2 v2.9.0 github.com/apache/arrow/go/v17 v17.0.0 github.com/cockroachdb/apd/v3 v3.2.1 - github.com/dolthub/go-mysql-server v0.18.2-0.20241015190154-54bd6d6e1ce8 - github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc + github.com/dolthub/go-mysql-server v0.18.2-0.20241016193930-58d51b356103 + github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e github.com/go-sql-driver/mysql v1.8.1 github.com/jmoiron/sqlx v1.4.0 github.com/marcboeker/go-duckdb v1.8.2-0.20241002112231-62d5fa8c0697 @@ -22,8 +22,8 @@ require ( ) replace ( - github.com/dolthub/go-mysql-server v0.18.2-0.20241015190154-54bd6d6e1ce8 => github.com/fanyang01/go-mysql-server v0.0.0-20241016052333-7fc0e18f41bb - github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc => github.com/apecloud/dolt-vitess v0.0.0-20241016030916-464ec1ba8a1a + github.com/dolthub/go-mysql-server v0.18.2-0.20241016193930-58d51b356103 => github.com/fanyang01/go-mysql-server v0.0.0-20241017031253-bef4d25c51a3 + github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e => github.com/apecloud/dolt-vitess v0.0.0-20241017031156-06988c627a21 ) require ( diff --git a/go.sum b/go.sum index 10b12aaf..ce79409c 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/apecloud/dolt-vitess v0.0.0-20240927100428-4ba1490cf5da h1:+sOwYwbN/k github.com/apecloud/dolt-vitess v0.0.0-20240927100428-4ba1490cf5da/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= github.com/apecloud/dolt-vitess v0.0.0-20241016030916-464ec1ba8a1a h1:ARRxRvo7HUKFvqKhXh+nRVEV5K+AuyVP6QlntDzQPww= github.com/apecloud/dolt-vitess v0.0.0-20241016030916-464ec1ba8a1a/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= +github.com/apecloud/dolt-vitess v0.0.0-20241017031156-06988c627a21 h1:z8IXSqvlSuJMKNitC62IY8k7BwZ7gfVG+Ju56jygZXQ= +github.com/apecloud/dolt-vitess v0.0.0-20241017031156-06988c627a21/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -79,6 +81,8 @@ github.com/dolthub/go-mysql-server v0.18.2-0.20240926171723-77ed13c03196 h1:H4bK github.com/dolthub/go-mysql-server v0.18.2-0.20240926171723-77ed13c03196/go.mod h1:lGbU2bK+QNnlETdUjOOaE+UnlEUu31VaQOFKAFGyZN4= github.com/dolthub/go-mysql-server v0.18.2-0.20241015190154-54bd6d6e1ce8 h1:opC/9GtHMpPf5v0eRdngp166LcJTTyQ+YZfyjAchHaY= github.com/dolthub/go-mysql-server v0.18.2-0.20241015190154-54bd6d6e1ce8/go.mod h1:Z8tket+3sYcU3d4yW90Ggld2d+C2DUgnpB8cBP0+GvI= +github.com/dolthub/go-mysql-server v0.18.2-0.20241016193930-58d51b356103 h1:AG0T2y5xORr384R9eALgPpdDVfilmlBjo4tSl+IY6G8= +github.com/dolthub/go-mysql-server v0.18.2-0.20241016193930-58d51b356103/go.mod h1:z/GGuH2asedC+lkJA4sx+C3oyRH1HRx8ET6N9AGBVms= github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ= github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI= github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 h1:JWkKRE4EHUcEVQCMRBej8DYxjYjRz/9MdF/NNQh0o70= @@ -87,6 +91,8 @@ github.com/dolthub/vitess v0.0.0-20240919225659-2ad81685e772 h1:vDwBX7Lc8DnA8Zk0 github.com/dolthub/vitess v0.0.0-20240919225659-2ad81685e772/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc h1:ZZgTRuxEwd3X67njtK30buHeZScLAd4W0rbRV8CORhE= github.com/dolthub/vitess v0.0.0-20241010201417-9d4f54b29ccc/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= +github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e h1:Ssd/iV0hAOShAgr0c4pJQNgh2E4my2XHblFIIam0D+4= +github.com/dolthub/vitess v0.0.0-20241016191424-d14e107a654e/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= @@ -101,6 +107,8 @@ github.com/fanyang01/go-mysql-server v0.0.0-20241016030019-a1d92d867df4 h1:l+Eaz github.com/fanyang01/go-mysql-server v0.0.0-20241016030019-a1d92d867df4/go.mod h1:muA0iXUB7NjOojVRfJBKE2dL4OAABq3ZSbISlTGvmQY= github.com/fanyang01/go-mysql-server v0.0.0-20241016052333-7fc0e18f41bb h1:FjAhczeEu2P/F2+YbKjR/Q4lgnD/0nCWPmaKHul797o= github.com/fanyang01/go-mysql-server v0.0.0-20241016052333-7fc0e18f41bb/go.mod h1:muA0iXUB7NjOojVRfJBKE2dL4OAABq3ZSbISlTGvmQY= +github.com/fanyang01/go-mysql-server v0.0.0-20241017031253-bef4d25c51a3 h1:DjF60upON4k4Ar/hLgg8b6QO+sZirZJBMN6XFJBtgMs= +github.com/fanyang01/go-mysql-server v0.0.0-20241017031253-bef4d25c51a3/go.mod h1:ZHioUWSihB9DKr55db8J3dUM9prjKesiNFVw6s1uo3k= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=