Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mssql] Reuse columns from ValidColumns #747

Merged
merged 4 commits into from
Jun 24, 2024
Merged

[mssql] Reuse columns from ValidColumns #747

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2969ad
[mssql] Reuse columns from `ValidColumns`
nathan-artie Jun 19, 2024
de9d5e2
Revert
nathan-artie Jun 19, 2024
a3ef0fa
Merge branch 'master' into nv/reuse-columns
nathan-artie Jun 22, 2024
662a844
Merge branch 'master' into nv/reuse-columns
nathan-artie Jun 24, 2024
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
10 changes: 4 additions & 6 deletions clients/mssql/staging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ func (s *Store) PrepareTemporaryTable(tableData *optimization.TableData, tableCo
}
}()

// TODO: Refactor the loop below to use the columns from [ValidColumns]
columns := columns.ColumnNames(tableData.ReadOnlyInMemoryCols().ValidColumns())
stmt, err := tx.Prepare(mssql.CopyIn(tempTableID.FullyQualifiedName(), mssql.BulkOptions{}, columns...))
cols := tableData.ReadOnlyInMemoryCols().ValidColumns()
stmt, err := tx.Prepare(mssql.CopyIn(tempTableID.FullyQualifiedName(), mssql.BulkOptions{}, columns.ColumnNames(cols)...))
if err != nil {
return fmt.Errorf("failed to prepare bulk insert: %w", err)
}
Expand All @@ -54,9 +53,8 @@ func (s *Store) PrepareTemporaryTable(tableData *optimization.TableData, tableCo
additionalDateFmts := s.config.SharedTransferConfig.TypingSettings.AdditionalDateFormats
for _, value := range tableData.Rows() {
var row []any
for _, col := range columns {
colKind, _ := tableData.ReadOnlyInMemoryCols().GetColumn(col)
castedValue, castErr := parseValue(value[col], colKind, additionalDateFmts)
for _, col := range cols {
castedValue, castErr := parseValue(value[col.Name()], col, additionalDateFmts)
if castErr != nil {
return castErr
}
Expand Down