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.

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

importer: fix collated string imports for MySQL/DELIMITED DATA #107918

Merged
merged 1 commit into from
Aug 7, 2023

Conversation

otan
Copy link
Contributor

@otan otan commented Jul 31, 2023

We previously special cased ParseDatumStringWithRawBytes for MySQL related imports, which was buggy for collated strings as well. Instead, make import have a specialised method for converting MySQL literals to the relevant data type without compromising on collated strings.

Resolves #107917

Release note (bug fix): Previously, using IMPORT INTO for DELIMITED DATA or MySQL imports would error with column ... does not exist if it was importing into a collated string column.

We previously special cased `ParseDatumStringWithRawBytes` for MySQL
related imports, which was buggy for collated strings as well. Instead,
make import have a specialised method for converting MySQL literals to
the relevant data type without compromising on collated strings.

Release note (bug fix): Previously, using IMPORT INTO for DELIMITED DATA
or MySQL imports would error with `column ... does not exist` if it was
importing into a collated string column.
@otan otan added backport-22.2.x backport-23.1.x Flags PRs that need to be backported to 23.1 labels Jul 31, 2023
@otan otan requested a review from rafiss July 31, 2023 22:56
@otan otan requested a review from a team as a code owner July 31, 2023 22:56
@otan otan requested a review from DrewKimball July 31, 2023 22:56
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@otan otan removed the request for review from rafiss August 1, 2023 05:34
Copy link
Collaborator

@DrewKimball DrewKimball left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @otan)

@otan
Copy link
Contributor Author

otan commented Aug 7, 2023

thanks

bors r=drewkimball

@craig
Copy link
Contributor

craig bot commented Aug 7, 2023

Build failed:

@otan
Copy link
Contributor Author

otan commented Aug 7, 2023

flakes

#108238
#108256

@otan
Copy link
Contributor Author

otan commented Aug 7, 2023

bors r=drewkimball

@craig
Copy link
Contributor

craig bot commented Aug 7, 2023

Build succeeded:

@blathers-crl
Copy link

blathers-crl bot commented Aug 7, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from d69fe91 to blathers/backport-release-22.2-107918: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

importer: IMPORT INTO ... DELIMITED DATA with collated strings does not work
3 participants