Commite9f833b

committed

close db properly

1 parent118bf98 commite9f833bCopy full SHA for e9f833b

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2363,10 +2363,8 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`2363`	`2363`	`if!version.Next() {`
`2364`	`2364`	`// it's critical we assign to the err variable, otherwise the defer statement`
`2365`	`2365`	`// that runs db.Close() will not execute it`
`2366`		`-iferr=version.Err();err!=nil {`
`2367`		`-returnnil,xerrors.Errorf("no rows returned for version select: %w",err)`
`2368`		`-}`
`2369`		`-returnnil,xerrors.Errorf("no rows returned for version select")`
	`2366`	`+err=xerrors.Errorf("no rows returned for version select: %w",version.Err())`
	`2367`	`+returnnil,err`
`2370`	`2368`	`}`
`2371`	`2369`	`varversionNumint`
`2372`	`2370`	`err=version.Scan(&versionNum)`
`@@ -2375,7 +2373,8 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`2375`	`2373`	`}`
`2376`	`2374`
`2377`	`2375`	`ifversionNum<130000 {`
`2378`		`-returnnil,xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d",versionNum)`
	`2376`	`+err=xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d",versionNum)`
	`2377`	`+returnnil,err`
`2379`	`2378`	`}`
`2380`	`2379`	`logger.Debug(ctx,"connected to postgresql",slog.F("version",versionNum))`
`2381`	`2380`

Comments

(0)