Merge pull request #4067 from dweitzman/sqlalchemy_collation

Parsing support for SHOW COLLATION WHERE
vitessio · Jul 9, 2018 · 69a63c4 · 69a63c4
2 parents 00f4b8d + 58bf0a6
commit 69a63c4
Show file tree

Hide file tree

Showing 5 changed files with 1,508 additions and 1,464 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -1280,10 +1280,11 @@ func (node VindexParam) walkSubtree(visit Visit) error {
 
 // Show represents a show statement.
 type Show struct {
- Type string
- OnTable TableName
- ShowTablesOpt *ShowTablesOpt
- Scope string
+ Type string
+ OnTable TableName
+ ShowTablesOpt *ShowTablesOpt
+ Scope string
+ ShowCollationFilterOpt *Expr
 }
 
 // Format formats the node.
@@ -1308,6 +1309,9 @@ func (node *Show) Format(buf *TrackedBuffer) {
  if node.HasOnTable() {
  buf.Myprintf(" on %v", node.OnTable)
  }
+ if node.Type == "collation" && node.ShowCollationFilterOpt != nil {
+ buf.Myprintf(" where %v", *node.ShowCollationFilterOpt)
+ }
 }
 
 // HasOnTable returns true if the show statement has an "on" clause

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -993,6 +993,9 @@ var (
  }, {
  input: "show collation",
  output: "show collation",
+ }, {
+ input: "show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'",
+ output: "show collation where `Charset` = 'utf8' and `Collation` = 'utf8_bin'",
  }, {
  input: "show create database d",
  output: "show create database",