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

Fix unquoted stmt fragments backslash escaping #3772

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Fix unquoted stmt fragments backslash escaping #3772

merged 2 commits into from
Dec 16, 2019

Conversation

ChristophWurst
Copy link
Contributor

Q A
Type bug
BC Break no
Fixed issues #3640

Summary

See #3640. A backslash in a literal wasn't detect by the statement parser and it thus failed to find the position of placeholders.

This is based on and supersedes #3641 with the new test case.

@ChristophWurst
Copy link
Contributor Author

AppVeyor build failed

"Cannot find path 'C:\tools\php' because it does not exist" seems unrelated :)

@ChristophWurst
Copy link
Contributor Author

@beberlei @morozov is there anything my PR is missing that blocks the integration of this patch? :)

Cheers

morozov
morozov previously approved these changes Dec 16, 2019
Copy link
Member

@morozov morozov left a comment

Choose a reason for hiding this comment

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

@ChristophWurst the patch looks good. While the existing tests look weird: why would anyone want to escape using a double slash? The SQL syntax explicitly states that it should be a character, not a string.

@morozov
Copy link
Member

morozov commented Dec 16, 2019

Could you try rebasing and see if the build gets fixed? Otherwise, I'll have to change the repository settings in order to be able to merge the PR.

rullzer and others added 2 commits December 16, 2019 19:01
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@ChristophWurst
Copy link
Contributor Author

Could you try rebasing and see if the build gets fixed? Otherwise, I'll have to change the repository settings in order to be able to merge the PR.

No worries. Squashed it :)

@morozov morozov merged commit f6312cb into doctrine:master Dec 16, 2019
@morozov morozov added this to the 2.10.1 milestone Dec 16, 2019
@morozov morozov self-assigned this Dec 16, 2019
@morozov morozov modified the milestones: 2.10.1, 3.0.0 Dec 16, 2019
@ChristophWurst ChristophWurst deleted the fix/get-unquoted-stmt-fragments-escape-backslash branch December 16, 2019 19:40
@ChristophWurst
Copy link
Contributor Author

Hey @morozov,

sorry for poking in this closed PR but can we backport this fix to the older versions 2.9 or 2.10? I couldn't find the docs about your backporting process and/or guidelines. Shall I open a ticket?

@morozov
Copy link
Member

morozov commented Jan 22, 2020

@ChristophWurst see the list of supported versions on the website. I can backport it to 2.10, no separate ticket needed.

@ChristophWurst
Copy link
Contributor Author

Got it. Thanks for the quick answer!

morozov added a commit that referenced this pull request Jan 22, 2020
Fix unquoted stmt fragments backslash escaping
@morozov morozov modified the milestones: 4.0.0, 2.10.2 Nov 17, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants