Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Vitess show character set where #5710

Merged
merged 12 commits into from
Feb 6, 2020
Merged

Fix: Vitess show character set where #5710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ea28f2
seperate show charset vs show charset in parser
Ronihe Jan 14, 2020
75c8abe
changed the executor accordingly
Ronihe Jan 14, 2020
94b7ba1
use where_expression_opt in parser, change ast and exector accordingly
Ronihe Jan 14, 2020
a54be7e
change the parser for show charset to filter with where or like
Ronihe Jan 15, 2020
e34ade7
exec func done, need to add more test
Ronihe Jan 16, 2020
30ae767
add err in func generateCharsetRows, added tests
Ronihe Jan 17, 2020
3c68962
fix err bug in the func generateCharsetRow
Ronihe Jan 17, 2020
047af95
correct error type to vterror
Ronihe Jan 17, 2020
bd211c0
changed the check err stmt to require.NoError0
Ronihe Feb 4, 2020
43f6f16
git merge master
Ronihe Feb 6, 2020
b10dd0f
updated
Ronihe Feb 6, 2020
adf89ea
added test for show charset
Ronihe Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ require (
github.com/mattn/go-runewidth v0.0.1 // indirect
github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
github.com/opentracing/opentracing-go v1.1.0
Expand Down
3 changes: 3 additions & 0 deletions go/vt/sqlparser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,9 @@ func (node *Show) Format(buf *TrackedBuffer) {
if node.Type == "collation" && node.ShowCollationFilterOpt != nil {
buf.Myprintf(" where %v", *node.ShowCollationFilterOpt)
}
if node.Type == "charset" && node.ShowTablesOpt != nil {
buf.Myprintf("%v", node.ShowTablesOpt.Filter)
}
if node.HasTable() {
buf.Myprintf(" %v", node.Table)
}
Expand Down
10 changes: 8 additions & 2 deletions go/vt/sqlparser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,13 +1138,19 @@ var (
output: "show charset",
}, {
input: "show character set like '%foo'",
output: "show charset",
output: "show charset like '%foo'",
}, {
input: "show charset",
output: "show charset",
}, {
input: "show charset like '%foo'",
output: "show charset",
output: "show charset like '%foo'",
Ronihe marked this conversation as resolved.
Show resolved Hide resolved
}, {
input: "show charset where 'charset' = 'utf8'",
output: "show charset where 'charset' = 'utf8'",
}, {
input: "show charset where 'charset' = '%foo'",
output: "show charset where 'charset' = '%foo'",
}, {
input: "show collation",
output: "show collation",
Expand Down
Loading