Skip to content

[8.19] ESQL: Disallow mixed quoted/unquoted patterns in FROM (#127636) #129576

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

Merged

Conversation

pawankartik-elastic
Copy link
Contributor

@pawankartik-elastic pawankartik-elastic commented Jun 17, 2025

This will backport the following commits from main to 8.19:

Disallow partial quoting: individual quoting of constituent strings in an index pattern

---------

Co-authored-by: Pawan Kartik <[email protected]>
(cherry picked from commit 9021040)

# Conflicts:
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java
#	x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/IdentifierGenerator.java
@pawankartik-elastic
Copy link
Contributor Author

I've verified that the ANTLR Java classes that are auto-generated are up-to-date by explicitly switching to this branch and running ./gradlew ":x-pack:plugin:esql:regen".

@pawankartik-elastic pawankartik-elastic added Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) :Analytics/ES|QL AKA ESQL labels Jun 17, 2025
@idegtiarenko
Copy link
Contributor

Do you mind including the same fix in this backport: #129611 ?

@pawankartik-elastic pawankartik-elastic removed the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Jun 18, 2025
@pawankartik-elastic
Copy link
Contributor Author

pawankartik-elastic commented Jun 18, 2025

I've pulled the fix into this backport and fixed the CI. Turns out the TS command is still METRICS in this branch and that affected the line number and offsets in the error messages — this caused the CI failure. Also, the grammar is different from what's on 9.1 and that's causing slightly different messages to appear. So I've adjusted the error messages.

Requested explicit approval for this backport for these reasons.

@pawankartik-elastic pawankartik-elastic merged commit 14e7037 into elastic:8.19 Jun 18, 2025
22 checks passed
@pawankartik-elastic pawankartik-elastic deleted the backport/8.19/pr-127636 branch June 19, 2025 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Analytics/ES|QL AKA ESQL backport Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) v8.19.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants