Partially apply bugfix in vitessio#8468

Signed-off-by: Andrew Mason <amason@slack-corp.com>
tinyspeck · Jul 18, 2021 · 767d29c · 767d29c
1 parent 6ec68f1
commit 767d29c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -467,10 +467,10 @@ func (ct *ColumnType) Format(buf *TrackedBuffer) {
  buf.astPrintf(ct, " %s", keywordStrings[DEFAULT])
  _, isLiteral := ct.Options.Default.(*Literal)
  _, isNullVal := ct.Options.Default.(*NullVal)
- if isLiteral || isNullVal {
- buf.astPrintf(ct, " %v", String(ct.Options.Default))
+ if isLiteral || isNullVal || isExprAliasForCurrentTimeStamp(ct.Options.Default) {
+ buf.astPrintf(ct, " %v", ct.Options.Default)
  } else {
- buf.astPrintf(ct, " (%v)", String(ct.Options.Default))
+ buf.astPrintf(ct, " (%v)", ct.Options.Default)
  }
  }
  if ct.Options.OnUpdate != nil {

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
@@ -1301,6 +1301,17 @@ func (node *ColName) CompliantName(suffix string) string {
  return node.Name.CompliantName() + suffix
 }
 
+// isExprAliasForCurrentTimeStamp returns true if the Expr provided is an alias for CURRENT_TIMESTAMP
+func isExprAliasForCurrentTimeStamp(expr Expr) bool {
+ switch node := expr.(type) {
+ case *FuncExpr:
+ return node.Name.EqualString("current_timestamp") || node.Name.EqualString("now") || node.Name.EqualString("localtimestamp") || node.Name.EqualString("localtime")
+ case *CurTimeFuncExpr:
+ return node.Name.EqualString("current_timestamp") || node.Name.EqualString("now") || node.Name.EqualString("localtimestamp") || node.Name.EqualString("localtime")
+ }
+ return false
+}
+
 // AtCount represents the '@' count in ColIdent
 type AtCount int