fix: grammar ambiguities from #2217

manticore-projects · manticore-projects · commit b409ceb5aa2c · 2025-04-08T08:53:36.000+07:00
- completes #2217 Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -7860,7 +7860,7 @@ AlterExpression AlterExpression():
                 LOOKAHEAD(4)
                 (
                   ( tk=<K_SPATIAL> | tk=<K_FULLTEXT> )
-                  [ tk2=<K_INDEX> | tk2=<K_KEY> ]
+                  [ LOOKAHEAD(2) ( tk2=<K_INDEX> | tk2=<K_KEY> ) ]
                   (
                       sk3 = RelObjectName()
                       columnNames = ColumnsNamesList()
@@ -8361,15 +8361,11 @@ AlterExpression AlterExpression():
       LOOKAHEAD(2) <K_EXCHANGE> <K_PARTITION> partitions=PartitionNamesList()
         <K_WITH> <K_TABLE> tk=<S_IDENTIFIER>
         [
-          LOOKAHEAD(2) <K_WITH> <K_VALIDATION>
-          {
-            alterExp.setExchangePartitionWithValidation(true);
-          }
-        |
-          LOOKAHEAD(2) <K_WITHOUT> <K_VALIDATION>
-          {
-            alterExp.setExchangePartitionWithoutValidation(false);
-          }
+            LOOKAHEAD(2) (
+                <K_WITH> <K_VALIDATION> { alterExp.setExchangePartitionWithValidation(true); }
+                |
+                <K_WITHOUT> <K_VALIDATION> { alterExp.setExchangePartitionWithoutValidation(false); }
+            )
         ]
         {
           alterExp.setOperation(AlterOperation.EXCHANGE_PARTITION);

Original file line number	Diff line number	Diff line change
`@@ -7860,7 +7860,7 @@ AlterExpression AlterExpression():`
`7860`	`7860`	`LOOKAHEAD(4)`
`7861`	`7861`	`(`
`7862`	`7862`	`( tk=<K_SPATIAL> \| tk=<K_FULLTEXT> )`
`7863`		`- [ tk2=<K_INDEX> \| tk2=<K_KEY> ]`
	`7863`	`+ [ LOOKAHEAD(2) ( tk2=<K_INDEX> \| tk2=<K_KEY> ) ]`
`7864`	`7864`	`(`
`7865`	`7865`	`sk3 = RelObjectName()`
`7866`	`7866`	`columnNames = ColumnsNamesList()`
`@@ -8361,15 +8361,11 @@ AlterExpression AlterExpression():`
`8361`	`8361`	`LOOKAHEAD(2) <K_EXCHANGE> <K_PARTITION> partitions=PartitionNamesList()`
`8362`	`8362`	`<K_WITH> <K_TABLE> tk=<S_IDENTIFIER>`
`8363`	`8363`	`[`
`8364`		`- LOOKAHEAD(2) <K_WITH> <K_VALIDATION>`
`8365`		`- {`
`8366`		`- alterExp.setExchangePartitionWithValidation(true);`
`8367`		`- }`
`8368`		`- \|`
`8369`		`- LOOKAHEAD(2) <K_WITHOUT> <K_VALIDATION>`
`8370`		`- {`
`8371`		`- alterExp.setExchangePartitionWithoutValidation(false);`
`8372`		`- }`
	`8364`	`+ LOOKAHEAD(2) (`
	`8365`	`+ <K_WITH> <K_VALIDATION> { alterExp.setExchangePartitionWithValidation(true); }`
	`8366`	`+ \|`
	`8367`	`+ <K_WITHOUT> <K_VALIDATION> { alterExp.setExchangePartitionWithoutValidation(false); }`
	`8368`	`+ )`
`8373`	`8369`	`]`
`8374`	`8370`	`{`
`8375`	`8371`	`alterExp.setOperation(AlterOperation.EXCHANGE_PARTITION);`