From e36f6ac135e9348e94660880543395b8bb64973f Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Mon, 18 Sep 2023 14:00:45 -0700 Subject: [PATCH] [auto-bump] [no-release-notes] dependency by max-hoffman (#6680) * [ga-bump-dep] Bump dependency in Dolt by max-hoffman * edit import insert source --------- Co-authored-by: max-hoffman Co-authored-by: Max Hoffman --- go/go.mod | 2 +- go/go.sum | 4 ++-- go/libraries/doltcore/mvdata/engine_table_writer.go | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/go/go.mod b/go/go.mod index 94e90ce6e4..c197ff55a7 100644 --- a/go/go.mod +++ b/go/go.mod @@ -59,7 +59,7 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/creasty/defaults v1.6.0 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 - github.com/dolthub/go-mysql-server v0.17.1-0.20230916212652-86f1cdf0339c + github.com/dolthub/go-mysql-server v0.17.1-0.20230918200753-53bd1b65bc61 github.com/dolthub/swiss v0.1.0 github.com/goccy/go-json v0.10.2 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 diff --git a/go/go.sum b/go/go.sum index f81a405c14..d27cb762f1 100644 --- a/go/go.sum +++ b/go/go.sum @@ -180,8 +180,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168= -github.com/dolthub/go-mysql-server v0.17.1-0.20230916212652-86f1cdf0339c h1:jjJ7mV0X7LVAkNGgDBtKAnPlsZYoeHFF2vSPB7NH/r4= -github.com/dolthub/go-mysql-server v0.17.1-0.20230916212652-86f1cdf0339c/go.mod h1:s4hz5TZpFkw8IdLVz58EKKm9cxvRd4jVw1Hs2o+tEXw= +github.com/dolthub/go-mysql-server v0.17.1-0.20230918200753-53bd1b65bc61 h1:HKpwQf4dZUBf8Z7PdXlIwukg1ACfNEnUN1VvbYG/G08= +github.com/dolthub/go-mysql-server v0.17.1-0.20230918200753-53bd1b65bc61/go.mod h1:s4hz5TZpFkw8IdLVz58EKKm9cxvRd4jVw1Hs2o+tEXw= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto= github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ= diff --git a/go/libraries/doltcore/mvdata/engine_table_writer.go b/go/libraries/doltcore/mvdata/engine_table_writer.go index 37bbc70349..5c3701d9c5 100644 --- a/go/libraries/doltcore/mvdata/engine_table_writer.go +++ b/go/libraries/doltcore/mvdata/engine_table_writer.go @@ -325,7 +325,14 @@ func (s *SqlEngineTableWriter) getInsertNode(inputChannel chan sql.Row, replace newC.Source = planbuilder.OnDupValuesPrefix schema[i] = newC } - parsedIns.Source = NewChannelRowSource(schema, inputChannel) + + switch n := parsedIns.Source.(type) { + case *plan.Values: + parsedIns.Source = NewChannelRowSource(schema, inputChannel) + case *plan.Project: + n.Child = NewChannelRowSource(schema, inputChannel) + } + parsedIns.Ignore = s.contOnErr parsedIns.IsReplace = replace analyzed, err := s.se.Analyze(s.sqlCtx, parsedIns)