Fixed collate, value_expression grammar closer to MySQL

Signed-off-by: ritwizsinha <[email protected]>

go/vt/sqlparser/ast.go

@@ -1510,7 +1510,6 @@ type ColumnType struct {
 
 	// Text field options
 	Charset string
-	Collate string
 
 	// Enum values
 	EnumValues []string
@@ -1535,6 +1534,7 @@ type ColumnTypeOptions struct {
 	As            Expr
 	Comment       *Literal
 	Storage       ColumnStorage
+	Collate       string
 	// Reference stores a foreign key constraint for the given column
 	Reference *ReferenceDefinition
 
@@ -1798,8 +1798,8 @@ type (
 	// ComparisonExprOperator is an enum for ComparisonExpr.Operator
 	ComparisonExprOperator int8
 
-	// RangeCond represents a BETWEEN or a NOT BETWEEN expression.
-	RangeCond struct {
+	// BetweenExpr represents a BETWEEN or a NOT BETWEEN expression.
+	BetweenExpr struct {
 		Operator RangeCondOperator
 		Left     Expr
 		From, To Expr
@@ -1927,7 +1927,7 @@ type (
 	// SubstrExpr('static string value', value_expression, value_expression)
 	// In this case StrVal will be set instead of Name.
 	SubstrExpr struct {
-		Name   *ColName
+		Name   Expr
 		StrVal *Literal
 		From   Expr
 		To     Expr
@@ -1978,7 +1978,7 @@ type (
 	// supported functions are documented in the grammar
 	CurTimeFuncExpr struct {
 		Name ColIdent
-		Fsp  Expr // fractional seconds precision, integer from 0 to 6
+		Fsp  *Literal // fractional seconds precision, integer from 0 to 6
 	}
 
 	// ExtractedSubquery is a subquery that has been extracted from the original AST
@@ -2003,7 +2003,7 @@ func (*OrExpr) iExpr()            {}
 func (*XorExpr) iExpr()           {}
 func (*NotExpr) iExpr()           {}
 func (*ComparisonExpr) iExpr()    {}
-func (*RangeCond) iExpr()         {}
+func (*BetweenExpr) iExpr()       {}
 func (*IsExpr) iExpr()            {}
 func (*ExistsExpr) iExpr()        {}
 func (*Literal) iExpr()           {}

go/vt/sqlparser/ast_format.go

@@ -495,8 +495,8 @@ func (ct *ColumnType) Format(buf *TrackedBuffer) {
 	if ct.Charset != "" {
 		buf.astPrintf(ct, " %s %s %s", keywordStrings[CHARACTER], keywordStrings[SET], ct.Charset)
 	}
-	if ct.Collate != "" {
-		buf.astPrintf(ct, " %s %s", keywordStrings[COLLATE], ct.Collate)
+	if ct.Options.Collate != "" {
+		buf.astPrintf(ct, " %s %s", keywordStrings[COLLATE], ct.Options.Collate)
 	}
 	if ct.Options.Null != nil && ct.Options.As == nil {
 		if *ct.Options.Null {
@@ -1008,7 +1008,7 @@ func (node *ComparisonExpr) Format(buf *TrackedBuffer) {
 }
 
 // Format formats the node.
-func (node *RangeCond) Format(buf *TrackedBuffer) {
+func (node *BetweenExpr) Format(buf *TrackedBuffer) {
 	buf.astPrintf(node, "%v %s %l and %r", node.Left, node.Operator.ToString(), node.From, node.To)
 }
 
@@ -1112,7 +1112,11 @@ func (node *TimestampFuncExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *CurTimeFuncExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "%s(%v)", node.Name.String(), node.Fsp)
+	if node.Fsp != nil {
+		buf.astPrintf(node, "%s(%v)", node.Name.String(), node.Fsp)
+	} else {
+		buf.astPrintf(node, "%s()", node.Name.String())
+	}
 }
 
 // Format formats the node.
@@ -1157,17 +1161,10 @@ func (node *ValuesFuncExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *SubstrExpr) Format(buf *TrackedBuffer) {
-	var val SQLNode
-	if node.Name != nil {
-		val = node.Name
-	} else {
-		val = node.StrVal
-	}
-
 	if node.To == nil {
-		buf.astPrintf(node, "substr(%v, %v)", val, node.From)
+		buf.astPrintf(node, "substr(%v, %v)", node.Name, node.From)
 	} else {
-		buf.astPrintf(node, "substr(%v, %v, %v)", val, node.From, node.To)
+		buf.astPrintf(node, "substr(%v, %v, %v)", node.Name, node.From, node.To)
 	}
 }