Disallow mixed quoted/unquoted patterns in FROM

alex-spies · alex-spies · commit 1b00c4711dca · 2025-05-02T15:02:38.000+02:00
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
@@ -108,18 +108,21 @@ indexPatternAndMetadataFields:
     ;
 
 indexPattern
-    : (clusterString COLON)? indexString
-    | indexString (CAST_OP selectorString)?
+    : clusterString COLON unquotedIndexString
+    | unquotedIndexString CAST_OP selectorString
+    | indexString
     ;
 
 clusterString
     : UNQUOTED_SOURCE
-    | QUOTED_STRING
     ;
 
 selectorString
     : UNQUOTED_SOURCE
-    | QUOTED_STRING
+    ;
+
+unquotedIndexString
+    : UNQUOTED_SOURCE
     ;
 
 indexString

Original file line number	Diff line number	Diff line change
`@@ -108,18 +108,21 @@ indexPatternAndMetadataFields:`
`108`	`108`	`;`
`109`	`109`
`110`	`110`	`indexPattern`
`111`		`- : (clusterString COLON)? indexString`
`112`		`- \| indexString (CAST_OP selectorString)?`
	`111`	`+ : clusterString COLON unquotedIndexString`
	`112`	`+ \| unquotedIndexString CAST_OP selectorString`
	`113`	`+ \| indexString`
`113`	`114`	`;`
`114`	`115`
`115`	`116`	`clusterString`
`116`	`117`	`: UNQUOTED_SOURCE`
`117`		`- \| QUOTED_STRING`
`118`	`118`	`;`
`119`	`119`
`120`	`120`	`selectorString`
`121`	`121`	`: UNQUOTED_SOURCE`
`122`		`- \| QUOTED_STRING`
	`122`	`+ ;`
	`123`	`+`
	`124`	`+unquotedIndexString`
	`125`	`+ : UNQUOTED_SOURCE`
`123`	`126`	`;`
`124`	`127`
`125`	`128`	`indexString`