fix(spanner/spansql): fix invalid timestamp literal formats (#6077)

neglect-yp · rahul2393 · web-flow · commit 6ab8bed93a97 · 2022-05-24T10:06:27.000+05:30
Co-authored-by: rahul2393 &lt;rahulyadavsep92@gmail.com&gt;
diff --git a/spanner/spansql/parser.go b/spanner/spansql/parser.go
@@ -3113,8 +3113,8 @@ var timestampFormats = []string{
 	"2006-01-02",
 	"2006-01-02 15:04:05",
 	"2006-01-02 15:04:05.000000",
-	"2006-01-02 15:04:05 -07:00",
-	"2006-01-02 15:04:05.000000 -07:00",
+	"2006-01-02 15:04:05-07:00",
+	"2006-01-02 15:04:05.000000-07:00",
 }
 
 var defaultLocation = func() *time.Location {
diff --git a/spanner/spansql/sql.go b/spanner/spansql/sql.go
@@ -736,7 +736,7 @@ func (dl DateLiteral) addSQL(sb *strings.Builder) {
 
 func (tl TimestampLiteral) SQL() string { return buildSQL(tl) }
 func (tl TimestampLiteral) addSQL(sb *strings.Builder) {
-	fmt.Fprintf(sb, "TIMESTAMP '%s'", time.Time(tl).Format("2006-01-02 15:04:05.000000 -07:00"))
+	fmt.Fprintf(sb, "TIMESTAMP '%s'", time.Time(tl).Format("2006-01-02 15:04:05.000000-07:00"))
 }
 
 func (jl JSONLiteral) SQL() string { return buildSQL(jl) }
diff --git a/spanner/spansql/sql_test.go b/spanner/spansql/sql_test.go
@@ -556,7 +556,7 @@ func TestSQL(t *testing.T) {
 		},
 		{
 			TimestampLiteral(time.Date(2014, time.September, 27, 12, 34, 56, 123456e3, latz)),
-			`TIMESTAMP '2014-09-27 12:34:56.123456 -07:00'`,
+			`TIMESTAMP '2014-09-27 12:34:56.123456-07:00'`,
 			reparseExpr,
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ func (dl DateLiteral) addSQL(sb *strings.Builder) {`
`736`	`736`
`737`	`737`	`func (tl TimestampLiteral) SQL() string { return buildSQL(tl) }`
`738`	`738`	`func (tl TimestampLiteral) addSQL(sb *strings.Builder) {`
`739`		`- fmt.Fprintf(sb, "TIMESTAMP '%s'", time.Time(tl).Format("2006-01-02 15:04:05.000000 -07:00"))`
	`739`	`+ fmt.Fprintf(sb, "TIMESTAMP '%s'", time.Time(tl).Format("2006-01-02 15:04:05.000000-07:00"))`
`740`	`740`	`}`
`741`	`741`
`742`	`742`	`func (jl JSONLiteral) SQL() string { return buildSQL(jl) }`
Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ func TestSQL(t *testing.T) {`
`556`	`556`	`},`
`557`	`557`	`{`
`558`	`558`	`TimestampLiteral(time.Date(2014, time.September, 27, 12, 34, 56, 123456e3, latz)),`
`559`		- `TIMESTAMP '2014-09-27 12:34:56.123456 -07:00'`,
	`559`	+ `TIMESTAMP '2014-09-27 12:34:56.123456-07:00'`,
`560`	`560`	`reparseExpr,`
`561`	`561`	`},`
`562`	`562`	`{`