Merge pull request #9 from stackql/feature/postgres-casting

postgres-suffix-casting

Author: general-kroll-4-life

go/vt/sqlparser/ast.go

@@ -727,6 +727,9 @@ type (
 	// ListArg represents a named list argument.
 	ListArg []byte
 
+	// ListArgConcatamer represents a concatamer string of apparent list arguments / postgres cast operators.
+	ListArgConcatamer []ListArg
+
 	// ValTuple represents a tuple of actual values.
 	ValTuple Exprs
 
@@ -742,6 +745,12 @@ type (
 		Expr     Expr
 	}
 
+	// UnaryCastConcatamerExpr represents an expression with a casting concatamer suffix.
+	UnaryCastConcatamerExpr struct {
+		CastConcatamer ListArgConcatamer
+		Expr           Expr
+	}
+
 	// IntervalExpr represents a date-time INTERVAL expression.
 	IntervalExpr struct {
 		Expr Expr
@@ -843,36 +852,37 @@ type (
 )
 
 // iExpr ensures that only expressions nodes can be assigned to a Expr
-func (*AndExpr) iExpr()           {}
-func (*OrExpr) iExpr()            {}
-func (*XorExpr) iExpr()           {}
-func (*NotExpr) iExpr()           {}
-func (*ComparisonExpr) iExpr()    {}
-func (*RangeCond) iExpr()         {}
-func (*IsExpr) iExpr()            {}
-func (*ExistsExpr) iExpr()        {}
-func (*SQLVal) iExpr()            {}
-func (*NullVal) iExpr()           {}
-func (BoolVal) iExpr()            {}
-func (*ColName) iExpr()           {}
-func (ValTuple) iExpr()           {}
-func (*Subquery) iExpr()          {}
-func (ListArg) iExpr()            {}
-func (*BinaryExpr) iExpr()        {}
-func (*UnaryExpr) iExpr()         {}
-func (*IntervalExpr) iExpr()      {}
-func (*CollateExpr) iExpr()       {}
-func (*FuncExpr) iExpr()          {}
-func (*TimestampFuncExpr) iExpr() {}
-func (*CurTimeFuncExpr) iExpr()   {}
-func (*CaseExpr) iExpr()          {}
-func (*ValuesFuncExpr) iExpr()    {}
-func (*ConvertExpr) iExpr()       {}
-func (*SubstrExpr) iExpr()        {}
-func (*ConvertUsingExpr) iExpr()  {}
-func (*MatchExpr) iExpr()         {}
-func (*GroupConcatExpr) iExpr()   {}
-func (*Default) iExpr()           {}
+func (*AndExpr) iExpr()                 {}
+func (*OrExpr) iExpr()                  {}
+func (*XorExpr) iExpr()                 {}
+func (*NotExpr) iExpr()                 {}
+func (*ComparisonExpr) iExpr()          {}
+func (*RangeCond) iExpr()               {}
+func (*IsExpr) iExpr()                  {}
+func (*ExistsExpr) iExpr()              {}
+func (*SQLVal) iExpr()                  {}
+func (*NullVal) iExpr()                 {}
+func (BoolVal) iExpr()                  {}
+func (*ColName) iExpr()                 {}
+func (ValTuple) iExpr()                 {}
+func (*Subquery) iExpr()                {}
+func (ListArg) iExpr()                  {}
+func (*BinaryExpr) iExpr()              {}
+func (*UnaryExpr) iExpr()               {}
+func (*UnaryCastConcatamerExpr) iExpr() {}
+func (*IntervalExpr) iExpr()            {}
+func (*CollateExpr) iExpr()             {}
+func (*FuncExpr) iExpr()                {}
+func (*TimestampFuncExpr) iExpr()       {}
+func (*CurTimeFuncExpr) iExpr()         {}
+func (*CaseExpr) iExpr()                {}
+func (*ValuesFuncExpr) iExpr()          {}
+func (*ConvertExpr) iExpr()             {}
+func (*SubstrExpr) iExpr()              {}
+func (*ConvertUsingExpr) iExpr()        {}
+func (*MatchExpr) iExpr()               {}
+func (*GroupConcatExpr) iExpr()         {}
+func (*Default) iExpr()                 {}
 
 // Exprs represents a list of value expressions.
 // It's not a valid expression because it's not parenthesized.
@@ -1766,6 +1776,15 @@ func (node *BinaryExpr) Format(buf *TrackedBuffer) {
 	buf.astPrintf(node, "%v %s %v", node.Left, node.Operator, node.Right)
 }
 
+// Format formats the node.
+func (node *UnaryCastConcatamerExpr) Format(buf *TrackedBuffer) {
+	var s string
+	for _, n := range node.CastConcatamer {
+		s = s + string(n)
+	}
+	buf.astPrintf(node, "%v%s", node.Expr, s)
+}
+
 // Format formats the node.
 func (node *UnaryExpr) Format(buf *TrackedBuffer) {
 	if _, unary := node.Expr.(*UnaryExpr); unary {

go/vt/sqlparser/ast_funcs.go

@@ -350,6 +350,14 @@ func (node TableName) IsEmpty() bool {
 	return node.Name.IsEmpty()
 }
 
+func (lac ListArgConcatamer) String() string {
+	var rv string
+	for _, entry := range lac {
+		rv = rv + string(entry)
+	}
+	return rv
+}
+
 // ToViewName returns a TableName acceptable for use as a VIEW. VIEW names are
 // always lowercase, so ToViewName lowercasese the name. Databases are case-sensitive
 // so Qualifier is left untouched.
@@ -544,7 +552,7 @@ func NewExecVarDef(colIdent ColIdent, val Expr) ExecVarDef {
 	}
 }
 
-//NewSelect is used to create a select statement
+// NewSelect is used to create a select statement
 func NewSelect(comments Comments, exprs SelectExprs, selectOptions []string, from TableExprs, where *Where, groupBy GroupBy, having *Where) *Select {
 	var cache *bool
 	var distinct, straightJoinHint, sqlFoundRows bool
@@ -858,7 +866,7 @@ func (node *Union) SetLock(lock string) {
 	node.Lock = lock
 }
 
-//Unionize returns a UNION, either creating one or adding SELECT to an existing one
+// Unionize returns a UNION, either creating one or adding SELECT to an existing one
 func Unionize(lhs, rhs SelectStatement, typ string, by OrderBy, limit *Limit, lock string) *Union {
 	union, isUnion := lhs.(*Union)
 	if isUnion {