Commit bb3dc77

committed

Merge branch '483-parse-timezone' into 'master'

fix(engine): parse timezone of the lastActivity date (#483) Closes #483 See merge request postgres-ai/database-lab!692

2 parents 3e96212 + 8dcc777 commit bb3dc77Copy full SHA for bb3dc77

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func ParsePostgresLastActivity(logTime, text string) (*time.Time, error) {`
`129`	`129`	`return nil, nil`
`130`	`130`	`}`
`131`	`131`
`132`		`- lastActivityTime, err := time.Parse("2006-01-02 15:04:05.000 UTC", logTime)`
	`132`	`+ lastActivityTime, err := time.Parse("2006-01-02 15:04:05.000 MST", logTime)`
`133`	`133`	`if err != nil {`
`134`	`134`	`return nil, errs.Wrap(err, "failed to parse the last activity time")`
`135`	`135`	`}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ func TestGetPostgresLastActivity(t *testing.T) {`
`20`	`20`	`logMessage: "duration: 9.893 ms statement: SELECT 1;",`
`21`	`21`	`timeActivity: pointer.ToTime(time.Date(2020, 1, 10, 11, 49, 14, 615000000, time.UTC)),`
`22`	`22`	`},`
	`23`	`+ {`
	`24`	`+ logTime: "2020年01月10日 11:49:14.615 CET",`
	`25`	`+ logMessage: "duration: 9.893 ms statement: SELECT 1;",`
	`26`	`+ timeActivity: pointer.ToTime(time.Date(2020, 1, 10, 11, 49, 14, 615000000, time.FixedZone("CET", 0))),`
	`27`	`+ },`
`23`	`28`	`{`
`24`	`29`	`logTime: "2020年01月11日 13:10:58.503 UTC",`
`25`	`30`	`logMessage: "duration: 0.077 ms statement:",`
`@@ -58,7 +63,7 @@ func TestGetPostgresLastActivityWhenFailedParseTime(t *testing.T) {`
`58`	`63`	`{`
`59`	`64`	`logTime: "2020年01月10日 11:49:14",`
`60`	`65`	`logMessage: "duration: 9.893 ms statement: SELECT 1;",`
`61`		- errorString: `failed to parse the last activity time: parsing time "2020-01-10 11:49:14" as "2006-01-02 15:04:05.000 UTC": cannot parse "" as ".000"`,
	`66`	+ errorString: `failed to parse the last activity time: parsing time "2020-01-10 11:49:14" as "2006-01-02 15:04:05.000 MST": cannot parse "" as ".000"`,
`62`	`67`	`},`
`63`	`68`	`}`
`64`	`69`

Comments

(0)