mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-23 18:58:50 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

Merge branch 'main' into macneale4-75692cb8

Browse Source
This commit is contained in:
Jason Fulghum
2023-09-20 15:25:37 -07:00
parent 49a579f5bf 54c98feacb
commit b6ac98d488
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/cmd/dolt/commands/filter-branch.go
View File

@@ -231,7 +231,7 @@ func processFilterQuery(ctx context.Context, dEnv *env.DoltEnv, cm *doltdb.Commi
_, itr, err = eng.Query(sqlCtx, query)
case *sqlparser.DDL:
_, itr, err = eng.Query(sqlCtx, query)
case *sqlparser.Select, *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.Union:
case *sqlparser.Select, *sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.SetOp:
return nil, fmt.Errorf("filter-branch queries must be write queries: '%s'", query)
default:

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

@@ -648,7 +648,7 @@ func execBatchMode(ctx *sql.Context, qryist cli.Queryist, input io.Reader, conti
if rowIter != nil {
switch sqlStatement.(type) {
case *sqlparser.Select, *sqlparser.Insert, *sqlparser.Update, *sqlparser.Delete,
*sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.Union:
*sqlparser.OtherRead, *sqlparser.Show, *sqlparser.Explain, *sqlparser.SetOp:
// For any statement that prints out result, print a newline to put the regular output on its own line
if fileReadProg != nil {
fileReadProg.printNewLineIfNeeded()