Skip to content

Commit 38d0e36

Browse files
fix: use proper tokens .. and ... in multi-part names for correct white space handling
Signed-off-by: Andreas Reichel <[email protected]>
1 parent a2f40dd commit 38d0e36

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

+16-2
Original file line numberDiff line numberDiff line change
@@ -2031,7 +2031,14 @@ ObjectNames RelObjectNames() : {
20312031
} {
20322032
token = RelObjectNameExt() { data.add(token); }
20332033
(
2034-
LOOKAHEAD (2) ( delimiter = "." | delimiter = ":" ) { delimiters.add(delimiter.image); } (( delimiter = "." | delimiter = ":" ) { data.add(null); delimiters.add(delimiter.image); })*
2034+
LOOKAHEAD (2) (
2035+
( delimiter = "..." { delimiters.add("."); data.add(null); delimiters.add("."); data.add(null); delimiters.add("."); } )
2036+
|
2037+
( delimiter = ".." { delimiters.add("."); data.add(null); delimiters.add("."); } )
2038+
|
2039+
( ( delimiter = "." | delimiter = ":" ) { delimiters.add(delimiter.image); } )
2040+
)
2041+
20352042
token = RelObjectNameExt2() { data.add(token); }
20362043
) *
20372044

@@ -2047,7 +2054,14 @@ ObjectNames ColumnIdentifier() : {
20472054
} {
20482055
token = RelObjectNameExt() { data.add(token); }
20492056
(
2050-
LOOKAHEAD (2) ( delimiter = "." ) { delimiters.add(delimiter.image); } (( delimiter = "." ) { data.add(null); delimiters.add(delimiter.image); })*
2057+
LOOKAHEAD (2) (
2058+
( delimiter = "..." { delimiters.add("."); data.add(null); delimiters.add("."); data.add(null); delimiters.add("."); } )
2059+
|
2060+
( delimiter = ".." { delimiters.add("."); data.add(null); delimiters.add("."); } )
2061+
|
2062+
( delimiter = "." { delimiters.add(delimiter.image); } )
2063+
)
2064+
20512065
token = RelObjectNameExt2() { data.add(token); }
20522066
) *
20532067

0 commit comments

Comments
 (0)