diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-28 10:34:00 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-06-28 07:34:00 -0700 |
| commit | 005dd0754ba6dec00d8e4a84a297d0f35fbefb2b (patch) | |
| tree | 9a21ff859d987cb067371939f37e385d97f92e03 /vendor/github.com/mattermost/gorp/select.go | |
| parent | 2dea567dcfcdfcd016c0da55a120c6e854760fb0 (diff) | |
| download | chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.tar.gz chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.tar.bz2 chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.zip | |
Update gorp to support query timeouts on postgres (#6730)
* Update gorp to support query timeouts on postgres
* Update help text to remove postgres exception
* Fix glide.lock
Diffstat (limited to 'vendor/github.com/mattermost/gorp/select.go')
| -rw-r--r-- | vendor/github.com/mattermost/gorp/select.go | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/vendor/github.com/mattermost/gorp/select.go b/vendor/github.com/mattermost/gorp/select.go index 1967b0246..10c84b084 100644 --- a/vendor/github.com/mattermost/gorp/select.go +++ b/vendor/github.com/mattermost/gorp/select.go @@ -167,15 +167,9 @@ func selectVal(e SqlExecutor, holder interface{}, query string, args ...interfac query, args = maybeExpandNamedQuery(dbMap, query, args) } - var rows *sql.Rows - var err error - if dbMap.Dialect.Name() != "PostgresDialect" { - ctx, cancel := context.WithTimeout(context.Background(), dbMap.QueryTimeout) - defer cancel() - rows, err = e.QueryContext(ctx, query, args...) - } else { - rows, err = e.Query(query, args...) - } + ctx, cancel := context.WithTimeout(context.Background(), dbMap.QueryTimeout) + defer cancel() + rows, err := e.QueryContext(ctx, query, args...) if err != nil { return err @@ -267,14 +261,9 @@ func rawselect(m *DbMap, exec SqlExecutor, i interface{}, query string, } // Run the query - var rows *sql.Rows - if m.Dialect.Name() != "PostgresDialect" { - ctx, cancel := context.WithTimeout(context.Background(), m.QueryTimeout) - defer cancel() - rows, err = exec.QueryContext(ctx, query, args...) - } else { - rows, err = exec.Query(query, args...) - } + ctx, cancel := context.WithTimeout(context.Background(), m.QueryTimeout) + defer cancel() + rows, err := exec.QueryContext(ctx, query, args...) if err != nil { return nil, err |