Merge pull request #7745 from planetscale/constraint-name

Constraint names and database names with spaces.
vitessio · Mar 26, 2021 · ee5cb86 · ee5cb86
2 parents 9c7b5ee + 57f4689
commit ee5cb86
Show file tree

Hide file tree

Showing 13 changed files with 3,532 additions and 3,420 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -156,7 +156,7 @@ type (
 	// DropKey is used to drop a key in an alter table statement
 	DropKey struct {
 		Type DropKeyType
-		Name string
+		Name ColIdent
 	}
 
 	// Force is used to specify force alter option in an alter table statement
@@ -182,8 +182,8 @@ type (
 
 	// RenameIndex clause is used to rename indexes in an alter table statement
 	RenameIndex struct {
-		OldName string
-		NewName string
+		OldName ColIdent
+		NewName ColIdent
 	}
 
 	// Validation clause is used to specify whether to use validation or not
@@ -338,7 +338,7 @@ type (
 	// DropDatabase represents a DROP database statement.
 	DropDatabase struct {
 		Comments Comments
-		DBName   string
+		DBName   TableIdent
 		IfExists bool
 	}
 
@@ -355,15 +355,15 @@ type (
 	// CreateDatabase represents a CREATE database statement.
 	CreateDatabase struct {
 		Comments      Comments
-		DBName        string
+		DBName        TableIdent
 		IfNotExists   bool
 		CreateOptions []CollateAndCharset
 		FullyParsed   bool
 	}
 
 	// AlterDatabase represents a ALTER database statement.
 	AlterDatabase struct {
-		DBName              string
+		DBName              TableIdent
 		UpdateDataDirectory bool
 		AlterOptions        []CollateAndCharset
 		FullyParsed         bool
@@ -1224,17 +1224,17 @@ func (node *AlterDatabase) IsFullyParsed() bool {
 
 // GetDatabaseName implements the DBDDLStatement interface
 func (node *DropDatabase) GetDatabaseName() string {
-	return node.DBName
+	return node.DBName.String()
 }
 
 // GetDatabaseName implements the DBDDLStatement interface
 func (node *CreateDatabase) GetDatabaseName() string {
-	return node.DBName
+	return node.DBName.String()
 }
 
 // GetDatabaseName implements the DBDDLStatement interface
 func (node *AlterDatabase) GetDatabaseName() string {
-	return node.DBName
+	return node.DBName.String()
 }
 
 // ParenSelect can actually not be a top level statement,
@@ -1269,7 +1269,7 @@ type (
 		Command ShowCommandType
 		Full    bool
 		Tbl     TableName
-		DbName  string
+		DbName  TableIdent
 		Filter  *ShowFilter
 	}
 
@@ -1413,7 +1413,7 @@ type VindexParam struct {
 
 // ConstraintDefinition describes a constraint in a CREATE TABLE statement
 type ConstraintDefinition struct {
-	Name    string
+	Name    ColIdent
 	Details ConstraintInfo
 }
 

diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -153,7 +153,7 @@ func (node *DropDatabase) Format(buf *TrackedBuffer) {
 	if node.IfExists {
 		exists = "if exists "
 	}
-	buf.astPrintf(node, "%s database %v%s%s", DropStr, node.Comments, exists, node.DBName)
+	buf.astPrintf(node, "%s database %v%s%v", DropStr, node.Comments, exists, node.DBName)
 }
 
 // Format formats the node.
@@ -565,8 +565,8 @@ func (node VindexParam) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (c *ConstraintDefinition) Format(buf *TrackedBuffer) {
-	if c.Name != "" {
-		buf.astPrintf(c, "constraint %s ", c.Name)
+	if !c.Name.IsEmpty() {
+		buf.astPrintf(c, "constraint %v ", c.Name)
 	}
 	c.Details.Format(buf)
 }
@@ -1307,8 +1307,8 @@ func (node *ShowBasic) Format(buf *TrackedBuffer) {
 	if !node.Tbl.IsEmpty() {
 		buf.astPrintf(node, " from %v", node.Tbl)
 	}
-	if node.DbName != "" {
-		buf.astPrintf(node, " from %s", node.DbName)
+	if !node.DbName.IsEmpty() {
+		buf.astPrintf(node, " from %v", node.DbName)
 	}
 	buf.astPrintf(node, "%v", node.Filter)
 }
@@ -1336,7 +1336,7 @@ func (node *CreateDatabase) Format(buf *TrackedBuffer) {
 	if node.IfNotExists {
 		buf.WriteString("if not exists ")
 	}
-	buf.astPrintf(node, "%s", node.DBName)
+	buf.astPrintf(node, "%v", node.DBName)
 	if node.CreateOptions != nil {
 		for _, createOption := range node.CreateOptions {
 			if createOption.IsDefault {
@@ -1351,8 +1351,8 @@ func (node *CreateDatabase) Format(buf *TrackedBuffer) {
 // Format formats the node.
 func (node *AlterDatabase) Format(buf *TrackedBuffer) {
 	buf.WriteString("alter database")
-	if node.DBName != "" {
-		buf.astPrintf(node, " %s", node.DBName)
+	if !node.DBName.IsEmpty() {
+		buf.astPrintf(node, " %v", node.DBName)
 	}
 	if node.UpdateDataDirectory {
 		buf.WriteString(" upgrade data directory name")
@@ -1588,8 +1588,8 @@ func (node *DropColumn) Format(buf *TrackedBuffer) {
 // Format formats the node
 func (node *DropKey) Format(buf *TrackedBuffer) {
 	buf.astPrintf(node, "drop %s", node.Type.ToString())
-	if node.Name != "" {
-		buf.astPrintf(node, " %s", node.Name)
+	if !node.Name.IsEmpty() {
+		buf.astPrintf(node, " %v", node.Name)
 	}
 }
 
@@ -1620,7 +1620,7 @@ func (node *RenameTableName) Format(buf *TrackedBuffer) {
 
 // Format formats the node
 func (node *RenameIndex) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "rename index %s to %s", node.OldName, node.NewName)
+	buf.astPrintf(node, "rename index %v to %v", node.OldName, node.NewName)
 }
 
 // Format formats the node

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go