Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add statement timeout query param for postgres #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 21, 2020
Merged

add statement timeout query param for postgres #327

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b8fc0ca
add statement timeout query param for postgres
psuresh309 Jan 18, 2020
2be1ffb
Update database/postgres/postgres.go
psuresh39 Jan 19, 2020
ebda042
add enable flag
psuresh309 Jan 20, 2020
87c2491
remove deafult catch errors
psuresh309 Jan 20, 2020
412ec4b
reformat
psuresh309 Jan 20, 2020
44e4734
only use background context for 0 timeout
psuresh309 Jan 20, 2020
9820ee4
refactor
psuresh309 Jan 21, 2020
dd4fc5d
refactor
psuresh309 Jan 21, 2020
bf6f2c5
Merge branch 'master' of https://github.com/golang-migrate/migrate in…
psuresh309 Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
@psuresh309
psuresh309 committed Jan 21, 2020
commit dd4fc5d0e182ede2aefcef6d3bd5a56344a0c37e
16 changes: 6 additions & 10 deletions database/postgres/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,8 @@ func (p *Postgres) Open(url string) (database.Driver, error) {

migrationsTable := purl.Query().Get("x-migrations-table")
statementTimeoutString := purl.Query().Get("x-statement-timeout")
var statementTimeout int
if statementTimeoutString == "" {
statementTimeout = 0
} else {
statementTimeout := 0
if statementTimeoutString != "" {
statementTimeout, err = strconv.Atoi(statementTimeoutString)
if err != nil {
return nil, err
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dhui wondering if we should throw a custom error here instead of the Atoi one, thoughts?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'd lose information w/ a custom error, so it'd be cleaner to wrap the error using multierror.

Expand Down Expand Up @@ -200,12 +198,10 @@ func (p *Postgres) Run(migration io.Reader) error {
if err != nil {
return err
}
var ctx context.Context
var cancel context.CancelFunc
if p.config.StatementTimeout == 0 {
ctx = context.Background()
} else {
ctx, cancel = context.WithTimeout(context.Background(), p.config.StatementTimeout)
ctx := context.Background()
if p.config.StatementTimeout != 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(ctx, p.config.StatementTimeout)
defer cancel()
}
// run migration
Expand Down