Refactor parser to support variations of SHOW INDEX statement

Signed-off-by: Saif Alharthi <[email protected]>
vitessio · Apr 3, 2020 · 0c167c1 · 0c167c1
1 parent b079336
commit 0c167c1
Show file tree

Hide file tree

Showing 5 changed files with 2,791 additions and 2,756 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -180,6 +180,7 @@ type (
 
 	// Show represents a show statement.
 	Show struct {
+		Extended               string
 		Type                   string
 		OnTable                TableName
 		Table                  TableName
@@ -1167,8 +1168,15 @@ func (node *Show) Format(buf *TrackedBuffer) {
 	nodeType := strings.ToLower(node.Type)
 	if (nodeType == "tables" || nodeType == "columns" || nodeType == "fields" || nodeType == "index" || nodeType == "keys" || nodeType == "indexes") && node.ShowTablesOpt != nil {
 		opt := node.ShowTablesOpt
-		buf.astPrintf(node, "show %s%s", opt.Full, nodeType)
-		if (nodeType == "columns" || nodeType == "fields" || nodeType == "index" || nodeType == "keys" || nodeType == "indexes") && node.HasOnTable() {
+		if node.Extended != "" {
+			buf.astPrintf(node, "show %s%s", node.Extended, nodeType)
+		} else {
+			buf.astPrintf(node, "show %s%s", opt.Full, nodeType)
+		}
+		if (nodeType == "columns" || nodeType == "fields") && node.HasOnTable() {
+			buf.astPrintf(node, " from %v", node.OnTable)
+		}
+		if (nodeType == "index" || nodeType == "keys" || nodeType == "indexes") && node.HasOnTable() {
 			buf.astPrintf(node, " from %v", node.OnTable)
 		}
 		if opt.DbName != "" {

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -1564,10 +1564,10 @@ var (
 		output: "show full tables from jiradb like '%'",
 	}, {
 		input:  "SHOW EXTENDED INDEX FROM `AO_E8B6CC_PROJECT_MAPPING` FROM `jiradb`",
-		output: "show index from AO_E8B6CC_PROJECT_MAPPING from jiradb",
+		output: "show extended index from AO_E8B6CC_PROJECT_MAPPING from jiradb",
 	}, {
 		input:  "SHOW EXTENDED KEYS FROM `AO_E8B6CC_ISSUE_MAPPING` FROM `jiradb`",
-		output: "show keys from AO_E8B6CC_ISSUE_MAPPING from jiradb",
+		output: "show extended keys from AO_E8B6CC_ISSUE_MAPPING from jiradb",
 	}, {
 		input:  "SHOW CREATE TABLE `jiradb`.`AO_E8B6CC_ISSUE_MAPPING`",
 		output: "show create table jiradb.AO_E8B6CC_ISSUE_MAPPING",
@@ -1579,7 +1579,10 @@ var (
 		output: "show full tables from jiradb like '%'",
 	}, {
 		input:  "SHOW EXTENDED INDEXES FROM `AO_E8B6CC_PROJECT_MAPPING` FROM `jiradb`",
-		output: "show indexes from AO_E8B6CC_PROJECT_MAPPING from jiradb",
+		output: "show extended indexes from AO_E8B6CC_PROJECT_MAPPING from jiradb",
+	}, {
+		input:  "SHOW EXTENDED INDEXES IN `AO_E8B6CC_PROJECT_MAPPING` IN `jiradb`",
+		output: "show extended indexes from AO_E8B6CC_PROJECT_MAPPING from jiradb",
 	}}
 )