Ensure vitessio#8425 is applied after file split

git seemed to not apply this change after the formatting functions got moved from `ast.go` to `ast_format.go` Signed-off-by: Andrew Mason <amason@slack-corp.com>
tinyspeck · Jul 18, 2021 · 6ec68f1 · 6ec68f1
1 parent f97e49f
commit 6ec68f1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -464,7 +464,14 @@ func (ct *ColumnType) Format(buf *TrackedBuffer) {
  }
  }
  if ct.Options.Default != nil {
- buf.astPrintf(ct, " %s %v", keywordStrings[DEFAULT], ct.Options.Default)
+ 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))
+ } else {
+ buf.astPrintf(ct, " (%v)", String(ct.Options.Default))
+ }
  }
  if ct.Options.OnUpdate != nil {
  buf.astPrintf(ct, " %s %s %v", keywordStrings[ON], keywordStrings[UPDATE], ct.Options.OnUpdate)

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