mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Fixed many more places where we weren't handling query errors appropriately.

Browse Source 
Signed-off-by: Zach Musgrave <zach@liquidata.co>
This commit is contained in:
Zach Musgrave
2020-09-11 16:14:38 -07:00
parent 49a9c6a5d3
commit 47aa939c44
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
go/cmd/dolt/commands/sql.go
View File

@@ -383,7 +383,7 @@ func newBatchedDatabase(name string, dEnv *env.DoltEnv) dsqle.Database {
return dsqle.NewBatchedDatabase(name, dEnv.DoltDB, dEnv.RepoState, dEnv.RepoStateWriter())
}
func execQuery(sqlCtx *sql.Context, readOnly bool, mrEnv env.MultiRepoEnv, roots map[string]*doltdb.RootValue, query string, format resultFormat) (map[string]*doltdb.RootValue, errhand.VerboseError) {
func execQuery(sqlCtx *sql.Context, readOnly bool, mrEnv env.MultiRepoEnv, roots map[string]*doltdb.RootValue, query string, format resultFormat) (newRoot map[string]*doltdb.RootValue, verr errhand.VerboseError) {
dbs := CollectDBs(mrEnv, newDatabase)
se, err := newSqlEngine(sqlCtx, readOnly, mrEnv, roots, format, dbs...)
if err != nil {
@@ -397,7 +397,12 @@ func execQuery(sqlCtx *sql.Context, readOnly bool, mrEnv env.MultiRepoEnv, roots
}
if rowIter != nil {
defer rowIter.Close()
defer func() {
err := rowIter.Close()
if verr == nil {
verr = errhand.VerboseErrorFromError(err)
}
}()
err = se.prettyPrintResults(sqlCtx, sqlSch, rowIter)
if err != nil {
return nil, errhand.VerboseErrorFromError(err)
@@ -667,8 +672,11 @@ func runShell(ctx *sql.Context, se *sqlEngine, mrEnv env.MultiRepoEnv) error {
verr := formatQueryError("", err)
shell.Println(verr.Verbose())
} else if rowIter != nil {
defer rowIter.Close()
err = se.prettyPrintResults(ctx, sqlSch, rowIter)
closeErr := rowIter.Close()
if err == nil {
err = closeErr
}
if err != nil {
shell.Println(color.RedString(err.Error()))
}
@@ -828,7 +836,10 @@ func processQuery(ctx *sql.Context, query string, se *sqlEngine) (sql.Schema, sq
sch, rowIter, err := se.query(ctx, query)
if rowIter != nil {
_ = rowIter.Close()
err = rowIter.Close()
if err != nil {
return nil, nil, err
}
}
if err != nil {
@@ -971,14 +982,19 @@ func processNonInsertBatchQuery(ctx *sql.Context, se *sqlEngine, query string, s
return flushBatchedEdits(ctx, se)
}
func processBatchInsert(ctx *sql.Context, se *sqlEngine, query string, sqlStatement sqlparser.Statement) error {
func processBatchInsert(ctx *sql.Context, se *sqlEngine, query string, sqlStatement sqlparser.Statement) (returnErr error) {
_, rowIter, err := se.query(ctx, query)
if err != nil {
return fmt.Errorf("Error inserting rows: %v", err.Error())
}
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 inserting rows: %v", err.Error())
@@ -1287,13 +1303,11 @@ func (se *sqlEngine) prettyPrintResults(ctx context.Context, sqlSch sql.Schema,
func printOKResult(ctx context.Context, iter sql.RowIter) (returnErr error) {
row, err := iter.Next()
defer func() {
err := iter.Close()
if returnErr == nil {
returnErr = err
}
}()
if err != nil {
return err
}
err = iter.Close()
if err != nil {
return err
}
@@ -1424,7 +1438,7 @@ func (se *sqlEngine) ddl(ctx *sql.Context, ddl *sqlparser.DDL, query string) (sq
case sqlparser.CreateStr, sqlparser.DropStr, sqlparser.AlterStr, sqlparser.RenameStr:
_, ri, err := se.query(ctx, query)
if err == nil {
ri.Close()
err = ri.Close()
}
return nil, nil, err
default: