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 Quoted Literals for Postgres and Redshift affecting rule L039 #2526

Merged
merged 2 commits into from
Jan 31, 2022

Conversation

tunetheweb
Copy link
Member

@tunetheweb tunetheweb commented Jan 31, 2022

Brief summary of the change made

Fixes #2495 - prevent final comma being swallowed up
Fixes #2516 - move DollarQuotedLiteralSegment into QuotedLiteralSegment

A potential nicer fix to #2495 would be to have an alternative to allow_trailing option, which doesn't error when there is a trailing delimiter, but recognised this is not part of this Grammar. But had a quick look and can't figure out how to do that.

Are there any other side effects of this change that we should be aware of?

No

Pull Request checklist

  • Please confirm you have completed any of the necessary steps below.

  • Included test cases to demonstrate any code changes, which may be one or more of the following:

    • .yml rule test cases in test/fixtures/rules/std_rule_cases.
    • .sql/.yml parser test cases in test/fixtures/dialects (note YML files can be auto generated with tox -e generate-fixture-yml).
    • Full autofix test cases in test/fixtures/linter/autofix.
    • Other.
  • Added appropriate documentation for the change.

  • Created GitHub issues for any relevant followup/future enhancements if appropriate.

@codecov
Copy link

codecov bot commented Jan 31, 2022

Codecov Report

Merging #2526 (fdf35ce) into main (c744e20) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##              main     #2526   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          162       162           
  Lines        11700     11700           
=========================================
  Hits         11700     11700           
Impacted Files Coverage Δ
src/sqlfluff/dialects/dialect_postgres.py 100.00% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c744e20...fdf35ce. Read the comment docs.

@tunetheweb tunetheweb changed the title Fix Rule L039 for Postgres and Redshift Fix Quoted Literals for Postgres and Redshift affecting rule L039 Jan 31, 2022
Copy link
Member

@barrywhart barrywhart left a comment

Choose a reason for hiding this comment

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

Looks great!

@tunetheweb tunetheweb merged commit 5ff415b into sqlfluff:main Jan 31, 2022
@tunetheweb tunetheweb deleted the postgres-multiline-fix branch January 31, 2022 13:00
@jpy-git
Copy link
Contributor

jpy-git commented Jan 31, 2022

A potential nicer fix to #2495 would be to have an alternative to allow_trailing option, which doesn't error when there is a trailing delimiter, but recognised this is not part of this Grammar. But had a quick look and can't figure out how to do that.

I actually tried this the other day and it worked fine in terms of not including but not failing on a trailing delimiter and when I tested the grammar on it's own it would work. But whenever I tried parsing some actual SQL it would still get included in the expression 🤷 Your solution works well though 👍

@tunetheweb
Copy link
Member Author

Glad I didn't work too hard on that then! 😁

Would be nice to look at Delimted at some point to stop being sooo Greedy (e.g. ignore commas in brackets), and also for this use case.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants