Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sql/iters/rel_iters.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ type JsonTableCol struct {
pos int
finished bool // exhausted all rows in data
currSib int

resultRow sql.Row
}

// IsSibling returns if the jsonTableCol contains multiple columns
Expand Down
3 changes: 2 additions & 1 deletion sql/rowexec/dml_iters.go
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ func (u *updateSourceIter) Next(ctx *sql.Context) (sql.Row, error) {
newRow = newRow[len(newRow)-expectedSchemaLen:]
}

return oldRow.Append(newRow), nil
row := append(oldRow, newRow...)
return row, nil
}

func (u *updateSourceIter) Close(ctx *sql.Context) error {
Expand Down
2 changes: 0 additions & 2 deletions sql/rowexec/insert.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,11 @@ func (i *insertIter) handleOnDuplicateKeyUpdate(ctx *sql.Context, oldRow, newRow
if !ok {
return nil, err
}

val = convertDataAndWarn(ctx, i.schema, newRow, idx, err)
} else {
return nil, err
}
}

updateAcc = val.(sql.Row)
}
// project LHS only
Expand Down
Loading
Loading