Merge pull request #692 from basvanbeek/early_bail

bail early if preloading rows.Next() results in rows.Err()
pull/698/head
Jack Christensen 2020-03-21 10:58:16 -05:00 committed by GitHub
commit 844dccf412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -304,6 +304,10 @@ func (c *Conn) QueryContext(ctx context.Context, query string, argsV []driver.Na
// Preload first row because otherwise we won't know what columns are available when database/sql asks.
more := rows.Next()
if err = rows.Err(); err != nil {
rows.Close()
return nil, err
}
return &Rows{conn: c, rows: rows, skipNext: true, skipNextMore: more}, nil
}