Commit a37d8e1

committed

Merge branch '335-backward-compatible-format' into 'master'

fix(engine): try to parse date in the legacy format to keep backward compatibility when restore clone sessions (#335) Closes #335 See merge request postgres-ai/database-lab!511

2 parents 21ff8dc + 9cdf738 commit a37d8e1Copy full SHA for a37d8e1

File tree

2 files changed

+11

-1

lines changed

engine/pkg/models
- local_time.go
- local_time_test.go

2 files changed

+11

-1

lines changed

`‎engine/pkg/models/local_time.go`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ import (`
`10`	`10`	`"time"`
`11`	`11`	`)`
`12`	`12`
	`13`	`+const legacyFormat = "2006年01月02日 15:04:05 UTC"`
	`14`	`+`
`13`	`15`	`// LocalTime defines a type of time with custom marshalling depends on locale.`
`14`	`16`	`type LocalTime struct {`
`15`	`17`	`time.Time`
`@@ -30,7 +32,11 @@ func (t *LocalTime) UnmarshalJSON(data []byte) error {`
`30`	`32`
`31`	`33`	`parsedTime, err := time.Parse(time.RFC3339, string(localTime))`
`32`	`34`	`if err != nil {`
`33`		`- return err`
	`35`	`+ // Try to parse the legacy format to keep backward compatibility when restore clone sessions.`
	`36`	`+ parsedTime, err = time.Parse(legacyFormat, string(localTime))`
	`37`	`+ if err != nil {`
	`38`	`+ return err`
	`39`	`+ }`
`34`	`40`	`}`
`35`	`41`
`36`	`42`	`t.Time = parsedTime`

`‎engine/pkg/models/local_time_test.go`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ func TestLocalTimeUnMarshalling(t *testing.T) {`
`52`	`52`	unmarshalling: []byte(`""`),
`53`	`53`	`expectedTime: time.Time{},`
`54`	`54`	`},`
	`55`	`+ {`
	`56`	+ unmarshalling: []byte(`"2006年02月01日 15:04:05 UTC"`),
	`57`	`+ expectedTime: time.Date(2006, 02, 1, 15, 04, 05, 0, time.UTC),`
	`58`	`+ },`
`55`	`59`	`}`
`56`	`60`
`57`	`61`	`for _, tc := range testCases {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a37d8e1

File tree

2 files changed

2 files changed

`‎engine/pkg/models/local_time.go`

`‎engine/pkg/models/local_time_test.go`

0 commit comments