Commit 2a0452d

committed

Merge branch '335-change-time-format' into 'master'

fix(engine): use RFC3339 as a time format (#335) Closes #335 See merge request postgres-ai/database-lab!502

2 parents 21759a2 + d143715 commit 2a0452dCopy full SHA for 2a0452d

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ linters:`
`82`	`82`	`- megacheck`
`83`	`83`	`- misspell`
`84`	`84`	`- prealloc`
`85`		`-# - revive # temporarily disabled: https://gitlab.com/postgres-ai/database-lab/-/merge_requests/498`
	`85`	`+ - revive`
`86`	`86`	`- structcheck`
`87`	`87`	`- stylecheck`
`88`	`88`	`- unconvert`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ const (`
`19`	`19`	`"id": "c5bfsk0hmvjd7kau71jg",`
`20`	`20`	`"snapshot": {`
`21`	`21`	`"id": "east5@snapshot_20211001112229",`
`22`		`- "createdAt": "2021-10-01 11:23:11+00:00",`
`23`		`- "dataStateAt": "2021-10-01 11:22:29+00:00"`
	`22`	`+ "createdAt": "2021-10-01T11:23:11+00:00",`
	`23`	`+ "dataStateAt": "2021-10-01T11:22:29+00:00"`
`24`	`24`	`},`
`25`	`25`	`"protected": false,`
`26`	`26`	`"deleteAt": "",`
`27`		`- "createdAt": "2021-10-01 12:25:52+00:00",`
	`27`	`+ "createdAt": "2021-10-01T12:25:52+00:00",`
`28`	`28`	`"status": {`
`29`	`29`	`"code": "OK",`
`30`	`30`	`"message": "Clone is ready to accept Postgres connections."`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ import (`
`10`	`10`	`"time"`
`11`	`11`	`)`
`12`	`12`
`13`		`-const localTimeFormat = "2006年01月02日 15:04:05 -07:00"`
`14`		`-`
`15`	`13`	`// LocalTime defines a type of time with custom marshalling depends on locale.`
`16`	`14`	`type LocalTime struct {`
`17`	`15`	`time.Time`
`@@ -30,7 +28,7 @@ func (t *LocalTime) UnmarshalJSON(data []byte) error {`
`30`	`28`	`return nil`
`31`	`29`	`}`
`32`	`30`
`33`		`- parsedTime, err := time.Parse(localTimeFormat, string(localTime))`
	`31`	`+ parsedTime, err := time.Parse(time.RFC3339, string(localTime))`
`34`	`32`	`if err != nil {`
`35`	`33`	`return err`
`36`	`34`	`}`
`@@ -46,5 +44,5 @@ func (t *LocalTime) MarshalJSON() ([]byte, error) {`
`46`	`44`	return []byte(`""`), nil
`47`	`45`	`}`
`48`	`46`
`49`		`- return []byte(fmt.Sprintf("%q", t.Local().Format(localTimeFormat))), nil`
	`47`	`+ return []byte(fmt.Sprintf("%q", t.Local().Format(time.RFC3339))), nil`
`50`	`48`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func TestLocalTimeMarshalling(t *testing.T) {`
`18`	`18`	`}{`
`19`	`19`	`{`
`20`	`20`	`inputTime: time.Date(2006, 02, 1, 15, 04, 05, 0, time.UTC),`
`21`		- marshalling: `"2006-02-01 15:04:05 +00:00"`,
	`21`	+ marshalling: `"2006-02-01T15:04:05Z"`,
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`inputTime: time.Time{},`
`@@ -45,7 +45,7 @@ func TestLocalTimeUnMarshalling(t *testing.T) {`
`45`	`45`	`expectedTime time.Time`
`46`	`46`	`}{`
`47`	`47`	`{`
`48`		- unmarshalling: []byte(`"2006-02-01 15:04:05+00:00"`),
	`48`	+ unmarshalling: []byte(`"2006-02-01T15:04:05+00:00"`),
`49`	`49`	`expectedTime: time.Date(2006, 02, 1, 15, 04, 05, 0, time.Local),`
`50`	`50`	`},`
`51`	`51`	`{`

Comments

(0)