diff options
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 |