Skip to content

Commit 090bb60

Browse files
minleejaeminleejae
authored
Add MySQL Index Parsing Support for ALTER TABLE Statements (#2215)
* add spatial, fulltext index * add complex spatial index case * fix Reflection test * add test case about add index * fix for passing test
1 parent 1ffec41 commit 090bb60

File tree

7 files changed

+321
-18
lines changed

7 files changed

+321
-18
lines changed

‎src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,8 @@ public CheckConstraint withIndexSpec(List<String> idxSpec) {
101101
return (CheckConstraint) super.withIndexSpec(idxSpec);
102102
}
103103

104+
@Override
105+
public CheckConstraint withIndexKeyword(String indexKeyword) {
106+
return (CheckConstraint) super.withIndexKeyword(indexKeyword);
107+
}
104108
}

‎src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,8 @@ public ExcludeConstraint withName(String name) {
9090
return (ExcludeConstraint) super.withName(name);
9191
}
9292

93+
@Override
94+
public ExcludeConstraint withIndexKeyword(String indexKeyword) {
95+
return (ExcludeConstraint) super.withIndexKeyword(indexKeyword);
96+
}
9397
}

‎src/main/java/net/sf/jsqlparser/statement/create/table/ForeignKeyIndex.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,8 @@ public ForeignKeyIndex withIndexSpec(List<String> idxSpec) {
204204
return (ForeignKeyIndex) super.withIndexSpec(idxSpec);
205205
}
206206

207+
@Override
208+
public ForeignKeyIndex withIndexKeyword(String indexKeyword) {
209+
return (ForeignKeyIndex) super.withIndexKeyword(indexKeyword);
210+
}
207211
}

‎src/main/java/net/sf/jsqlparser/statement/create/table/Index.java‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class Index implements Serializable {
2828
private List<ColumnParams> columns;
2929
private List<String> idxSpec;
3030
private String commentText;
31+
private String indexKeyword;
3132

3233
public List<String> getColumnsNames() {
3334
return columns.stream()
@@ -80,7 +81,9 @@ public String getName() {
8081

8182
public void setName(String name) {
8283
this.name.clear();
83-
this.name.add(name);
84+
if (name != null) {
85+
this.name.add(name);
86+
}
8487
}
8588

8689
public void setName(List<String> name) {
@@ -133,18 +136,33 @@ public Index withIndexSpec(List<String> idxSpec) {
133136
return this;
134137
}
135138

139+
public void setIndexKeyword(String indexKeyword) {
140+
this.indexKeyword = indexKeyword;
141+
}
142+
143+
public String getIndexKeyword() {
144+
return indexKeyword;
145+
}
146+
147+
public Index withIndexKeyword(String indexKeyword) {
148+
this.setIndexKeyword(indexKeyword);
149+
return this;
150+
}
151+
136152
@Override
137153
public String toString() {
138154
String idxSpecText = PlainSelect.getStringList(idxSpec, false, false);
139-
String head = (type != null ? type : "") + (!name.isEmpty() ? " " + getName() : "");
140-
String tail = PlainSelect.getStringList(columns, true, true)
141-
+ (!"".equals(idxSpecText) ? " " + idxSpecText : "");
155+
String keyword = (indexKeyword != null) ? " " + indexKeyword : "";
156+
String head =
157+
(type != null ? type : "") +
158+
keyword +
159+
(!name.isEmpty() ? " " + getName() : "") +
160+
(using != null ? " USING " + using : "");
142161

143-
if ("".equals(tail)) {
144-
return head;
145-
}
162+
String tail = PlainSelect.getStringList(columns, true, true)
163+
+ (!idxSpecText.isEmpty() ? " " + idxSpecText : "");
146164

147-
return head + " " + tail;
165+
return tail.isEmpty() ? head : head + " " + tail;
148166
}
149167

150168
public Index withType(String type) {

‎src/main/java/net/sf/jsqlparser/statement/create/table/NamedConstraint.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,8 @@ public NamedConstraint withIndexSpec(List<String> idxSpec) {
7070
return (NamedConstraint) super.withIndexSpec(idxSpec);
7171
}
7272

73+
@Override
74+
public NamedConstraint withIndexKeyword(String indexKeyword) {
75+
return (NamedConstraint) super.withIndexKeyword(indexKeyword);
76+
}
7377
}

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

Lines changed: 114 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
317317
| <K_INTO:"INTO">
318318
| <K_INVALIDATE:"INVALIDATE">
319319
| <K_INVERSE:"INVERSE">
320+
| <K_INVISIBLE:"INVISIBLE">
320321
| <K_IS:"IS">
321322
| <K_ISNULL:"ISNULL">
322323
| <K_JOIN:"JOIN">
@@ -400,6 +401,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
400401
| <K_OPTIMIZE: "OPTIMIZE" >
401402
| <K_PARALLEL:"PARALLEL">
402403
| <K_PARENT:"PARENT">
404+
| <K_PARSER: "PARSER">
403405
| <K_PARTITION:"PARTITION">
404406
| <K_PARTITIONING:"PARTITIONING">
405407
| <K_PATH:"PATH">
@@ -474,6 +476,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
474476
| <K_SIZE:"SIZE">
475477
| <K_SKIP: "SKIP">
476478
| <K_SOME:"SOME">
479+
| <K_SPATIAL:"SPATIAL">
477480
| <K_START:"START">
478481
| <K_STORED: "STORED">
479482
| <K_STRICT: "STRICT">
@@ -534,6 +537,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
534537
| <K_VALUES:"VALUES">
535538
| <K_VERBOSE: "VERBOSE">
536539
| <K_VIEW:"VIEW">
540+
| <K_VISIBLE: "VISIBLE">
537541
| <K_VOLATILE:"VOLATILE">
538542
| <K_CONCURRENTLY:"CONCURRENTLY">
539543
| <K_WAIT : "WAIT">
@@ -2148,7 +2152,7 @@ String RelObjectNameWithoutValue() :
21482152
{ Token tk = null; }
21492153
{
21502154
( tk=<DATA_TYPE> | tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_DATE_LITERAL> | tk=<K_DATETIMELITERAL> | tk=<K_STRING_FUNCTION_NAME> | tk=<K_ISOLATION> | tk=<K_TIME_KEY_EXPR> | tk=<K_TEXT_LITERAL>
2151-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="IMPORT" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="STORED" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VIEW" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
2155+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="AGGREGATE" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | tk="AUTO_INCREMENT" | tk="BASE64" | tk="BEGIN" | tk="BERNOULLI" | tk="BINARY" | tk="BIT" | tk="BLOCK" | tk="BROWSE" | tk="BUFFERS" | tk="BY" | tk="BYTE" | tk="BYTES" | tk="CACHE" | tk="CALL" | tk="CASCADE" | tk="CASE" | tk="CAST" | tk="CHANGE" | tk="CHANGES" | tk="CHAR" | tk="CHARACTER" | tk="CHECKPOINT" | tk="CLOSE" | tk="COALESCE" | tk="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | tk="CORRESPONDING" | tk="COSTS" | tk="COUNT" | tk="CS" | tk="CYCLE" | tk="DATA" | tk="DATABASE" | tk="DATETIME" | tk="DBA_RECYCLEBIN" | tk="DDL" | tk="DECLARE" | tk="DEFERRABLE" | tk="DELAYED" | tk="DELETE" | tk="DESC" | tk="DESCRIBE" | tk="DISABLE" | tk="DISCARD" | tk="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="ENCRYPTION" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCHANGE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FILTER" | tk="FIRST" | tk="FLUSH" | tk="FN" | tk="FOLLOWING" | tk="FORMAT" | tk="FULLTEXT" | tk="FUNCTION" | tk="GRANT" | tk="GROUP_CONCAT" | tk="GUARD" | tk="HASH" | tk="HIGH" | tk="HIGH_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="IMPORT" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="INVERSE" | tk="INVISIBLE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="KEY_BLOCK_SIZE" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATCH_ALL" | tk="MATCH_ANY" | tk="MATCH_PHRASE" | tk="MATCH_PHRASE_PREFIX" | tk="MATCH_REGEXP" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | tk="NAME" | tk="NEXT" | tk="NO" | tk="NOCACHE" | tk="NOKEEP" | tk="NOLOCK" | tk="NOMAXVALUE" | tk="NOMINVALUE" | tk="NOORDER" | tk="NOTHING" | tk="NOTNULL" | tk="NOVALIDATE" | tk="NOWAIT" | tk="NULLS" | tk="OF" | tk="OFF" | tk="OPEN" | tk="OVER" | tk="OVERFLOW" | tk="OVERLAPS" | tk="OVERRIDING" | tk="OVERWRITE" | tk="PARALLEL" | tk="PARENT" | tk="PARSER" | tk="PARTITION" | tk="PARTITIONING" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PLUS" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="REBUILD" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="REMOVE" | tk="RENAME" | tk="REORGANIZE" | tk="REPAIR" | tk="REPEATABLE" | tk="REPLACE" | tk="RESET" | tk="RESPECT" | tk="RESTART" | tk="RESTRICT" | tk="RESTRICTED" | tk="RESUMABLE" | tk="RESUME" | tk="RETURN" | tk="RLIKE" | tk="ROLLBACK" | tk="ROLLUP" | tk="ROOT" | tk="ROW" | tk="ROWS" | tk="RR" | tk="RS" | tk="SAFE_CAST" | tk="SAVEPOINT" | tk="SCHEMA" | tk="SECURE" | tk="SEED" | tk="SEPARATOR" | tk="SEQUENCE" | tk="SESSION" | tk="SETS" | tk="SHARE" | tk="SHOW" | tk="SHUTDOWN" | tk="SIBLINGS" | tk="SIGNED" | tk="SIMILAR" | tk="SIZE" | tk="SKIP" | tk="SPATIAL" | tk="STORED" | tk="STRICT" | tk="STRING" | tk="STRUCT" | tk="SUMMARIZE" | tk="SUSPEND" | tk="SWITCH" | tk="SYNONYM" | tk="SYSTEM" | tk="TABLE" | tk="TABLESPACE" | tk="TEMP" | tk="TEMPORARY" | tk="TEXT" | tk="THAN" | tk="THEN" | tk="TIMEOUT" | tk="TIMESTAMPTZ" | tk="TIMEZONE" | tk="TINYTEXT" | tk="TO" | tk="TRIGGER" | tk="TRUNCATE" | tk="TRY_CAST" | tk="TUMBLING" | tk="TYPE" | tk="UNLOGGED" | tk="UNQIESCE" | tk="UNSIGNED" | tk="UPDATE" | tk="UPSERT" | tk="UR" | tk="USER" | tk="VALIDATE" | tk="VALIDATION" | tk="VERBOSE" | tk="VIEW" | tk="VISIBLE" | tk="VOLATILE" | tk="WAIT" | tk="WITHIN" | tk="WITHOUT" | tk="WITHOUT_ARRAY_WRAPPER" | tk="WORK" | tk="XML" | tk="XMLAGG" | tk="XMLDATA" | tk="XMLSCHEMA" | tk="XMLTEXT" | tk="XSINIL" | tk="YAML" | tk="YES" | tk="ZONE" )
21522156
{ return tk.image; }
21532157
}
21542158

@@ -6686,7 +6690,7 @@ CreateIndex CreateIndex():
66866690
CreateIndex createIndex = new CreateIndex();
66876691
Table table = null;
66886692
List<Index.ColumnParams> colNames;
6689-
Token using;
6693+
String indexType;
66906694
Index index = null;
66916695
List<String> parameter = new ArrayList<String>();
66926696
List<String> tailParameters = new ArrayList<String>();
@@ -6701,12 +6705,12 @@ CreateIndex CreateIndex():
67016705
(
67026706
LOOKAHEAD(3)(
67036707
<K_ON> table=Table()
6704-
[ <K_USING> using=<S_IDENTIFIER> { index.setUsing(using.image); } ]
6708+
[ indexType=UsingIndexType() { index.setUsing(indexType); } ]
67056709
)
67066710
|
67076711
(
6708-
[ <K_USING> using=<S_IDENTIFIER> {
6709-
index.setUsing(using.image);
6712+
[ indexType=UsingIndexType() {
6713+
index.setUsing(indexType);
67106714
createIndex.setIndexTypeBeforeOn(true);
67116715
}
67126716
]
@@ -7651,6 +7655,65 @@ Index IndexWithComment(Index index):
76517655
}
76527656
}
76537657

7658+
void IndexOptionList(List<String> list) :
7659+
{}
7660+
{
7661+
(
7662+
IndexOption(list)
7663+
)*
7664+
}
7665+
7666+
String UsingIndexType() :
7667+
{
7668+
String sk = null;
7669+
}
7670+
{
7671+
<K_USING> ( sk = RelObjectName() )
7672+
{
7673+
return sk;
7674+
}
7675+
}
7676+
7677+
void IndexOption(List<String> list) :
7678+
{
7679+
Token tk1 = null;
7680+
Token tk2 = null;
7681+
String sk1 = null;
7682+
boolean useEqual = false;
7683+
}
7684+
{
7685+
(
7686+
tk1=<K_KEY_BLOCK_SIZE> ["=" { useEqual = true; } ] tk2=<S_LONG>
7687+
{
7688+
list.add("KEY_BLOCK_SIZE" + (useEqual ? " = " : "") + tk2.image);
7689+
}
7690+
|
7691+
tk1=<K_WITH> <K_PARSER> tk2=<S_IDENTIFIER>
7692+
{
7693+
list.add("WITH PARSER " + tk2.image);
7694+
}
7695+
|
7696+
tk1=<K_COMMENT> tk2=<S_CHAR_LITERAL>
7697+
{
7698+
list.add("COMMENT " + tk2.image);
7699+
}
7700+
|
7701+
tk1=<K_VISIBLE>
7702+
{
7703+
list.add("VISIBLE");
7704+
}
7705+
|
7706+
tk1=<K_INVISIBLE>
7707+
{
7708+
list.add("INVISIBLE");
7709+
}
7710+
|
7711+
sk1 = UsingIndexType(){
7712+
list.add("USING " + sk1);
7713+
}
7714+
)
7715+
}
7716+
76547717
List<PartitionDefinition> PartitionDefinitions():
76557718
{
76567719
Token tk;
@@ -7745,6 +7808,7 @@ AlterExpression AlterExpression():
77457808
String truncatePartitionName = null;
77467809

77477810
String identifier = null;
7811+
List<String> indexSpec = new ArrayList<String>();
77487812

77497813
// for captureRest()
77507814
List<String> tokens = new LinkedList<String>();
@@ -7770,15 +7834,55 @@ AlterExpression AlterExpression():
77707834
|
77717835
LOOKAHEAD(2) (
77727836
(tk=<K_KEY> { alterExp.setUk(true); } | tk=<K_INDEX>)
7773-
sk3 = RelObjectName()
7774-
columnNames = ColumnsNamesList()
7837+
(
7838+
LOOKAHEAD(3)
7839+
sk3 = RelObjectName()
7840+
[ sk4 = UsingIndexType() ]
7841+
columnNames = ColumnsNamesList()
7842+
|
7843+
[ sk4 = UsingIndexType() ]
7844+
columnNames = ColumnsNamesList()
7845+
)
7846+
IndexOptionList(indexSpec = new ArrayList<String>())
77757847
{
7776-
index = new Index().withType(tk.image).withName(sk3).withColumnsNames(columnNames);
7848+
index = new Index()
7849+
.withIndexKeyword(tk.image)
7850+
.withName(sk3)
7851+
.withUsing(sk4)
7852+
.withColumnsNames(columnNames)
7853+
.withIndexSpec(indexSpec);
7854+
77777855
alterExp.setIndex(index);
77787856
}
77797857
constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); }
7780-
[ <K_USING> sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }]
7781-
[ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ]
7858+
)
7859+
|
7860+
(
7861+
( tk=<K_SPATIAL> | tk=<K_FULLTEXT> )
7862+
[ tk2=<K_INDEX> | tk2=<K_KEY> ]
7863+
(
7864+
LOOKAHEAD(2)
7865+
sk3 = RelObjectName()
7866+
columnNames = ColumnsNamesList()
7867+
|
7868+
columnNames = ColumnsNamesList()
7869+
)
7870+
IndexOptionList(indexSpec = new ArrayList<String>())
7871+
{
7872+
String type = tk.image;
7873+
String keyword = tk2 != null ? tk2.image : null;
7874+
index = new Index()
7875+
.withType(type)
7876+
.withIndexKeyword(keyword)
7877+
.withColumnsNames(columnNames)
7878+
.withIndexSpec(indexSpec);
7879+
7880+
if (sk3 != null) {
7881+
index.setName(sk3);
7882+
}
7883+
7884+
alterExp.setIndex(index);
7885+
}
77827886
)
77837887
|
77847888
LOOKAHEAD(2) (

0 commit comments

Comments
 (0)