mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-25 03:05:52 -05:00
Code Issues Packages Projects Releases 169 Wiki Activity

One more place we weren't checking the err value on Close()

Browse Source 
Signed-off-by: Zach Musgrave <zach@liquidata.co>
This commit is contained in:
Zach Musgrave
2020-09-11 16:17:14 -07:00
parent 47aa939c44
commit 2bd381288d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/sql.go
+7 -2
View File
@@ -944,7 +944,7 @@ func processBatchQuery(ctx *sql.Context, query string, se *sqlEngine) error {
return nil
}
func processNonInsertBatchQuery(ctx *sql.Context, se *sqlEngine, query string, sqlStatement sqlparser.Statement) error {
func processNonInsertBatchQuery(ctx *sql.Context, se *sqlEngine, query string, sqlStatement sqlparser.Statement) (returnErr error) {
// We need to commit whatever batch edits we've accumulated so far before executing the query
err := flushBatchedEdits(ctx, se)
if err != nil {
@@ -957,7 +957,12 @@ func processNonInsertBatchQuery(ctx *sql.Context, se *sqlEngine, query string, s
}
if rowIter != nil {
defer rowIter.Close()
defer func() {
err := rowIter.Close()
if returnErr == nil {
returnErr = err
}
}()
err = mergeResultIntoStats(sqlStatement, rowIter, batchEditStats)
if err != nil {
return fmt.Errorf("error executing statement: %v", err.Error())