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

Lazy match escaped quotes in RedshiftToS3Operator #40206

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

jasonspeck
Copy link
Contributor

In #35986, RedshiftToS3Operator began wrapping select_query in $$ to handle single quotes. Escaped single quotes ('') are un-escaped using regex replacement for backwards compatibilty. The regex is greedy, however, and lines containing multiple strings inside of escaped single quotes only have the outermost quotes un-escaped.

A query such as:

SELECT * FROM table WHERE name IN (''foo'', ''bar'')

is modified to:

SELECT * FROM table WHERE name IN ('foo'', ''bar')

In this example, the operator succeeds but the results are unexpected.

This PR changes the regex pattern to match as few characters as possible, and adds test coverage for this case.


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in newsfragments.

@boring-cyborg boring-cyborg bot added area:providers provider:amazon-aws AWS/Amazon - related issues labels Jun 12, 2024
Copy link

boring-cyborg bot commented Jun 12, 2024

Congratulations on your first Pull Request and welcome to the Apache Airflow community! If you have any issues or are unsure about any anything please check our Contributors' Guide (https://github.com/apache/airflow/blob/main/contributing-docs/README.rst)
Here are some useful points:

  • Pay attention to the quality of your code (ruff, mypy and type annotations). Our pre-commits will help you with that.
  • In case of a new feature add useful documentation (in docstrings or in docs/ directory). Adding a new operator? Check this short guide Consider adding an example DAG that shows how users should use it.
  • Consider using Breeze environment for testing locally, it's a heavy docker but it ships with a working Airflow and a lot of integrations.
  • Be patient and persistent. It might take some time to get a review or get the final approval from Committers.
  • Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Mailing list and Slack.
  • Be sure to read the Airflow Coding style.
  • Always keep your Pull Requests rebased, otherwise your build might fail due to changes not related to your commits.
    Apache Airflow is a community-driven project and together we are making it better 🚀.
    In case of doubts contact the developers at:
    Mailing List: dev@airflow.apache.org
    Slack: https://s.apache.org/airflow-slack

@jasonspeck jasonspeck force-pushed the lazy-match-single-quotes branch from 0774673 to 93477cb Compare June 12, 2024 19:15
Copy link
Contributor

@vincbeck vincbeck left a comment

Choose a reason for hiding this comment

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

Nice catch and thanks for teaching me the operator +?in regex

@vincbeck vincbeck merged commit 835f28c into apache:main Jun 12, 2024
50 checks passed
Copy link

boring-cyborg bot commented Jun 12, 2024

Awesome work, congrats on your first merged pull request! You are invited to check our Issue Tracker for additional contributions.

@jasonspeck jasonspeck deleted the lazy-match-single-quotes branch June 12, 2024 20:12
romsharon98 pushed a commit to romsharon98/airflow that referenced this pull request Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:providers provider:amazon-aws AWS/Amazon - related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants