From f3de75e77faddbb02c14fc2d024bbed8cd6e02b6 Mon Sep 17 00:00:00 2001 From: minleejae Date: Fri, 4 Apr 2025 12:13:41 +0900 Subject: [PATCH 1/5] add spatial, fulltext index --- .../statement/create/table/Index.java | 17 +++++++- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 29 ++++++++++++- .../jsqlparser/statement/alter/AlterTest.java | 41 +++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java index ec7a2d606..3cfc2077f 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java @@ -28,6 +28,7 @@ public class Index implements Serializable { private List columns; private List idxSpec; private String commentText; + private String indexKeyword; public List getColumnsNames() { return columns.stream() @@ -133,10 +134,24 @@ public Index withIndexSpec(List idxSpec) { return this; } + public void setIndexKeyword(String indexKeyword) { + this.indexKeyword = indexKeyword; + } + + public String getIndexKeyword() { + return indexKeyword; + } + + public Index withIndexKeyword(String indexKeyword) { + this.setIndexKeyword(indexKeyword); + return this; + } + @Override public String toString() { String idxSpecText = PlainSelect.getStringList(idxSpec, false, false); - String head = (type != null ? type : "") + (!name.isEmpty() ? " " + getName() : ""); + String keyword = (indexKeyword != null) ? " " + indexKeyword : ""; + String head = (type != null ? type : "") + keyword + (!name.isEmpty() ? " " + getName() : ""); String tail = PlainSelect.getStringList(columns, true, true) + (!"".equals(idxSpecText) ? " " + idxSpecText : ""); diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 3d807c4d3..ab8b89c58 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -474,6 +474,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -2148,7 +2149,7 @@ String RelObjectNameWithoutValue() : { Token tk = null; } { ( tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= - | 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" ) + | 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="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="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" ) { return tk.image; } } @@ -7781,6 +7782,32 @@ AlterExpression AlterExpression(): [ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ] ) | + ( + ( tk= | tk= ) + [ tk2= | tk2= ] + ( + LOOKAHEAD(2) + sk3 = RelObjectName() + columnNames = ColumnsNamesList() + | + columnNames = ColumnsNamesList() + ) + { + String type = tk.image; + String keyword = tk2 != null ? tk2.image : null; + index = new Index() + .withType(type) + .withIndexKeyword(keyword) + .withColumnsNames(columnNames); + + if (sk3 != null) { + index.setName(sk3); + } + + alterExp.setIndex(index); + } + ) + | LOOKAHEAD(2) ( sk3=RelObjectName() tk= { alterExp.withColumnName(sk3).withCommentText(tk.image); } ) diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index b1261e4ad..9c94447c4 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1837,4 +1837,45 @@ public void testAlterTableKeyBlockSizeAlgorithmLock() throws JSQLParserException assertSqlCanBeParsedAndDeparsed(sql); } + + @Test + public void testAlterTableAddFullTextIndex() throws JSQLParserException { + String sql = "ALTER TABLE yum_table_myisam ADD FULLTEXT (name)"; + Statement stmt = CCJSqlParserUtil.parse(sql); + + Alter alter = (Alter) stmt; + assertEquals("yum_table_myisam", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertNotNull(alterExpressions); + assertEquals(1, alterExpressions.size()); + + AlterExpression indexExp = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, indexExp.getOperation()); + assertEquals("FULLTEXT", indexExp.getIndex().getType()); + assertEquals("name", indexExp.getIndex().getColumnsNames().get(0)); + + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableAddSpatialIndex() throws JSQLParserException { + String sql = "ALTER TABLE places ADD SPATIAL KEY sp_idx_location(location)"; + Statement stmt = CCJSqlParserUtil.parse(sql); + + Alter alter = (Alter) stmt; + assertEquals("places", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertNotNull(alterExpressions); + assertEquals(1, alterExpressions.size()); + + AlterExpression indexExp = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, indexExp.getOperation()); + assertEquals("SPATIAL", indexExp.getIndex().getType()); + assertEquals("sp_idx_location", indexExp.getIndex().getName()); + assertEquals("location", indexExp.getIndex().getColumnsNames().get(0)); + + assertSqlCanBeParsedAndDeparsed(sql); + } } From 2645f661cebba3c2258f518e65dc31fa525d30e8 Mon Sep 17 00:00:00 2001 From: minleejae Date: Fri, 4 Apr 2025 15:03:39 +0900 Subject: [PATCH 2/5] add complex spatial index case --- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 53 ++++++++++++++++++- .../jsqlparser/statement/alter/AlterTest.java | 38 +++++++++++++ 2 files changed, 89 insertions(+), 2 deletions(-) diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index ab8b89c58..33c007e0e 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -317,6 +317,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -400,6 +401,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -535,6 +537,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -2149,7 +2152,7 @@ String RelObjectNameWithoutValue() : { Token tk = null; } { ( tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= | tk= - | 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="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="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" ) + | 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" ) { return tk.image; } } @@ -7652,6 +7655,49 @@ Index IndexWithComment(Index index): } } +void IndexOptionList(List list) : +{} +{ + ( + IndexOption(list) + )* +} + +void IndexOption(List list) : +{ + Token tk1 = null; + Token tk2 = null; + boolean useEqual = false; +} +{ + ( + tk1= ["=" { useEqual = true; } ] tk2= + { + list.add("KEY_BLOCK_SIZE" + (useEqual ? " = " : "") + tk2.image); + } + | + tk1= tk2= + { + list.add("WITH PARSER " + tk2.image); + } + | + tk1= tk2= + { + list.add("COMMENT " + tk2.image); + } + | + tk1= + { + list.add("VISIBLE"); + } + | + tk1= + { + list.add("INVISIBLE"); + } + ) +} + List PartitionDefinitions(): { Token tk; @@ -7746,6 +7792,7 @@ AlterExpression AlterExpression(): String truncatePartitionName = null; String identifier = null; + List indexSpec = new ArrayList(); // for captureRest() List tokens = new LinkedList(); @@ -7792,13 +7839,15 @@ AlterExpression AlterExpression(): | columnNames = ColumnsNamesList() ) + IndexOptionList(indexSpec = new ArrayList()) { String type = tk.image; String keyword = tk2 != null ? tk2.image : null; index = new Index() .withType(type) .withIndexKeyword(keyword) - .withColumnsNames(columnNames); + .withColumnsNames(columnNames) + .withIndexSpec(indexSpec); if (sk3 != null) { index.setName(sk3); diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index 9c94447c4..9f8b4962c 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1878,4 +1878,42 @@ public void testAlterTableAddSpatialIndex() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed(sql); } + + @Test + public void testAlterTableAddFullTextIndexWithOptions() throws JSQLParserException { + String sql = "ALTER TABLE my_table ADD FULLTEXT my_idx(col1, col2) " + + "KEY_BLOCK_SIZE = 8 WITH PARSER ngram COMMENT 'fulltext' INVISIBLE"; + + Statement stmt = CCJSqlParserUtil.parse(sql); + Alter alter = (Alter) stmt; + + assertEquals("my_table", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertNotNull(alterExpressions); + assertEquals(1, alterExpressions.size()); + + AlterExpression indexExp = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, indexExp.getOperation()); + + Index index = indexExp.getIndex(); + assertNotNull(index); + assertEquals("FULLTEXT", index.getType()); + assertEquals("my_idx", index.getName()); + + List columnNames = index.getColumnsNames(); + assertEquals(2, columnNames.size()); + assertEquals("col1", columnNames.get(0)); + assertEquals("col2", columnNames.get(1)); + + List indexSpec = index.getIndexSpec(); + assertNotNull(indexSpec); + assertEquals(4, indexSpec.size()); + assertEquals("KEY_BLOCK_SIZE = 8", indexSpec.get(0)); + assertEquals("WITH PARSER ngram", indexSpec.get(1)); + assertEquals("COMMENT 'fulltext'", indexSpec.get(2)); + assertEquals("INVISIBLE", indexSpec.get(3)); + + assertSqlCanBeParsedAndDeparsed(sql); + } } From 887effba89053dcad8733c1cfa0131b4a1242063 Mon Sep 17 00:00:00 2001 From: minleejae Date: Fri, 4 Apr 2025 15:32:27 +0900 Subject: [PATCH 3/5] fix Reflection test --- .../sf/jsqlparser/statement/create/table/CheckConstraint.java | 4 ++++ .../jsqlparser/statement/create/table/ExcludeConstraint.java | 4 ++++ .../sf/jsqlparser/statement/create/table/ForeignKeyIndex.java | 4 ++++ .../java/net/sf/jsqlparser/statement/create/table/Index.java | 3 ++- .../sf/jsqlparser/statement/create/table/NamedConstraint.java | 4 ++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java b/src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java index b81f7132d..b803a1f7b 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/CheckConstraint.java @@ -101,4 +101,8 @@ public CheckConstraint withIndexSpec(List idxSpec) { return (CheckConstraint) super.withIndexSpec(idxSpec); } + @Override + public CheckConstraint withIndexKeyword(String indexKeyword) { + return (CheckConstraint) super.withIndexKeyword(indexKeyword); + } } diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java index 0ec34dd24..4cdc37bc4 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java @@ -90,4 +90,8 @@ public ExcludeConstraint withName(String name) { return (ExcludeConstraint) super.withName(name); } + @Override + public ExcludeConstraint withIndexKeyword(String indexKeyword) { + return (ExcludeConstraint) super.withIndexKeyword(indexKeyword); + } } diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ForeignKeyIndex.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ForeignKeyIndex.java index eb9f20c4b..c877a1ad9 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/ForeignKeyIndex.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/ForeignKeyIndex.java @@ -204,4 +204,8 @@ public ForeignKeyIndex withIndexSpec(List idxSpec) { return (ForeignKeyIndex) super.withIndexSpec(idxSpec); } + @Override + public ForeignKeyIndex withIndexKeyword(String indexKeyword) { + return (ForeignKeyIndex) super.withIndexKeyword(indexKeyword); + } } diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java index 3cfc2077f..ac1a5e9e8 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java @@ -151,7 +151,8 @@ public Index withIndexKeyword(String indexKeyword) { public String toString() { String idxSpecText = PlainSelect.getStringList(idxSpec, false, false); String keyword = (indexKeyword != null) ? " " + indexKeyword : ""; - String head = (type != null ? type : "") + keyword + (!name.isEmpty() ? " " + getName() : ""); + String head = + (type != null ? type : "") + keyword + (!name.isEmpty() ? " " + getName() : ""); String tail = PlainSelect.getStringList(columns, true, true) + (!"".equals(idxSpecText) ? " " + idxSpecText : ""); diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/NamedConstraint.java b/src/main/java/net/sf/jsqlparser/statement/create/table/NamedConstraint.java index 026d56631..ee2cce33b 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/NamedConstraint.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/NamedConstraint.java @@ -70,4 +70,8 @@ public NamedConstraint withIndexSpec(List idxSpec) { return (NamedConstraint) super.withIndexSpec(idxSpec); } + @Override + public NamedConstraint withIndexKeyword(String indexKeyword) { + return (NamedConstraint) super.withIndexKeyword(indexKeyword); + } } From 0bd163af32e6cbfb29e37de415cae8fc33932e92 Mon Sep 17 00:00:00 2001 From: minleejae Date: Fri, 4 Apr 2025 15:48:20 +0900 Subject: [PATCH 4/5] add test case about add index --- .../statement/create/table/Index.java | 4 +- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 9 ++- .../jsqlparser/statement/alter/AlterTest.java | 62 +++++++++++++++++++ 3 files changed, 72 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java index ac1a5e9e8..5319f571d 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java @@ -81,7 +81,9 @@ public String getName() { public void setName(String name) { this.name.clear(); - this.name.add(name); + if (name != null) { + this.name.add(name); + } } public void setName(List name) { diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 33c007e0e..b7cd50d1d 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -7818,8 +7818,13 @@ AlterExpression AlterExpression(): | LOOKAHEAD(2) ( (tk= { alterExp.setUk(true); } | tk=) - sk3 = RelObjectName() - columnNames = ColumnsNamesList() + ( + LOOKAHEAD(2) + sk3 = RelObjectName() + columnNames = ColumnsNamesList() + | + columnNames = ColumnsNamesList() + ) { index = new Index().withType(tk.image).withName(sk3).withColumnsNames(columnNames); alterExp.setIndex(index); diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index 9f8b4962c..9d282f7ea 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1916,4 +1916,66 @@ public void testAlterTableAddFullTextIndexWithOptions() throws JSQLParserExcepti assertSqlCanBeParsedAndDeparsed(sql); } + + @Test + public void testAlterTableAddUnnamedIndex() throws JSQLParserException { + String sql = "ALTER TABLE employees ADD INDEX (name1, name2)"; + + Statement stmt = CCJSqlParserUtil.parse(sql); + Alter alter = (Alter) stmt; + + assertEquals("employees", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertNotNull(alterExpressions); + assertEquals(1, alterExpressions.size()); + + AlterExpression indexExp = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, indexExp.getOperation()); + + Index index = indexExp.getIndex(); + assertNotNull(index); + assertNull(index.getName()); + + List columnNames = index.getColumnsNames(); + assertEquals(2, columnNames.size()); + assertEquals("name1", columnNames.get(0)); + assertEquals("name2", columnNames.get(1)); + + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableAddIndexWithOptions() throws JSQLParserException { + String sql = "ALTER TABLE employees ADD INDEX idx_lastname (last_name) " + + "USING BTREE KEY_BLOCK_SIZE = 16 COMMENT 'Performance tuning' VISIBLE"; + + Statement stmt = CCJSqlParserUtil.parse(sql); + Alter alter = (Alter) stmt; + + assertEquals("employees", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertNotNull(alterExpressions); + assertEquals(1, alterExpressions.size()); + + AlterExpression indexExp = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, indexExp.getOperation()); + + Index index = indexExp.getIndex(); + assertNotNull(index); + assertEquals("INDEX", index.getIndexKeyword()); // 명시적 "INDEX" 키워드 + assertEquals("idx_lastname", index.getName()); + assertEquals("last_name", index.getColumnsNames().get(0)); + + List indexSpec = index.getIndexSpec(); + assertNotNull(indexSpec); + assertEquals(3, indexSpec.size()); + assertEquals("USING BTREE", indexSpec.get(0)); + assertEquals("KEY_BLOCK_SIZE=16", indexSpec.get(1)); + assertEquals("COMMENT 'Performance tuning'", indexSpec.get(2)); + assertEquals("VISIBLE", indexSpec.get(3)); + + assertSqlCanBeParsedAndDeparsed(sql); + } } From 404b08f8f44142d37d7d39650f923daa3c3d84fb Mon Sep 17 00:00:00 2001 From: minleejae Date: Fri, 4 Apr 2025 17:17:45 +0900 Subject: [PATCH 5/5] fix for passing test --- .../statement/create/table/Index.java | 14 +++---- .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 39 +++++++++++++++---- .../jsqlparser/statement/alter/AlterTest.java | 30 ++++++++++++-- 3 files changed, 65 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java index 5319f571d..aaa07c4ea 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/Index.java @@ -154,15 +154,15 @@ public String toString() { String idxSpecText = PlainSelect.getStringList(idxSpec, false, false); String keyword = (indexKeyword != null) ? " " + indexKeyword : ""; String head = - (type != null ? type : "") + keyword + (!name.isEmpty() ? " " + getName() : ""); - String tail = PlainSelect.getStringList(columns, true, true) - + (!"".equals(idxSpecText) ? " " + idxSpecText : ""); + (type != null ? type : "") + + keyword + + (!name.isEmpty() ? " " + getName() : "") + + (using != null ? " USING " + using : ""); - if ("".equals(tail)) { - return head; - } + String tail = PlainSelect.getStringList(columns, true, true) + + (!idxSpecText.isEmpty() ? " " + idxSpecText : ""); - return head + " " + tail; + return tail.isEmpty() ? head : head + " " + tail; } public Index withType(String type) { diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index b7cd50d1d..3f7f987cd 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -6690,7 +6690,7 @@ CreateIndex CreateIndex(): CreateIndex createIndex = new CreateIndex(); Table table = null; List colNames; - Token using; + String indexType; Index index = null; List parameter = new ArrayList(); List tailParameters = new ArrayList(); @@ -6705,12 +6705,12 @@ CreateIndex CreateIndex(): ( LOOKAHEAD(3)( table=Table() - [ using= { index.setUsing(using.image); } ] + [ indexType=UsingIndexType() { index.setUsing(indexType); } ] ) | ( - [ using= { - index.setUsing(using.image); + [ indexType=UsingIndexType() { + index.setUsing(indexType); createIndex.setIndexTypeBeforeOn(true); } ] @@ -7663,10 +7663,22 @@ void IndexOptionList(List list) : )* } +String UsingIndexType() : +{ + String sk = null; +} +{ + ( sk = RelObjectName() ) + { + return sk; + } +} + void IndexOption(List list) : { Token tk1 = null; Token tk2 = null; + String sk1 = null; boolean useEqual = false; } { @@ -7695,6 +7707,10 @@ void IndexOption(List list) : { list.add("INVISIBLE"); } + | + sk1 = UsingIndexType(){ + list.add("USING " + sk1); + } ) } @@ -7819,19 +7835,26 @@ AlterExpression AlterExpression(): LOOKAHEAD(2) ( (tk= { alterExp.setUk(true); } | tk=) ( - LOOKAHEAD(2) + LOOKAHEAD(3) sk3 = RelObjectName() + [ sk4 = UsingIndexType() ] columnNames = ColumnsNamesList() | + [ sk4 = UsingIndexType() ] columnNames = ColumnsNamesList() ) + IndexOptionList(indexSpec = new ArrayList()) { - index = new Index().withType(tk.image).withName(sk3).withColumnsNames(columnNames); + index = new Index() + .withIndexKeyword(tk.image) + .withName(sk3) + .withUsing(sk4) + .withColumnsNames(columnNames) + .withIndexSpec(indexSpec); + alterExp.setIndex(index); } constraints=AlterExpressionConstraintState() { alterExp.setConstraints(constraints); } - [ sk4=RelObjectName() { alterExp.addParameters("USING", sk4); }] - [ LOOKAHEAD(2) index = IndexWithComment(index) { alterExp.setIndex(index); } ] ) | ( diff --git a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java index 9d282f7ea..204600bb1 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1964,18 +1964,42 @@ public void testAlterTableAddIndexWithOptions() throws JSQLParserException { Index index = indexExp.getIndex(); assertNotNull(index); - assertEquals("INDEX", index.getIndexKeyword()); // 명시적 "INDEX" 키워드 + assertEquals("INDEX", index.getIndexKeyword()); assertEquals("idx_lastname", index.getName()); assertEquals("last_name", index.getColumnsNames().get(0)); List indexSpec = index.getIndexSpec(); assertNotNull(indexSpec); - assertEquals(3, indexSpec.size()); + assertEquals(4, indexSpec.size()); assertEquals("USING BTREE", indexSpec.get(0)); - assertEquals("KEY_BLOCK_SIZE=16", indexSpec.get(1)); + assertEquals("KEY_BLOCK_SIZE = 16", indexSpec.get(1)); assertEquals("COMMENT 'Performance tuning'", indexSpec.get(2)); assertEquals("VISIBLE", indexSpec.get(3)); assertSqlCanBeParsedAndDeparsed(sql); } + + @Test + public void testAlterTableAddIndex_UsingBeforeColumns() throws JSQLParserException { + String sql = "ALTER TABLE t ADD INDEX idx_name USING BTREE (col)"; + + Statement stmt = CCJSqlParserUtil.parse(sql); + Alter alter = (Alter) stmt; + + assertEquals("t", alter.getTable().getFullyQualifiedName()); + + List alterExpressions = alter.getAlterExpressions(); + assertEquals(1, alterExpressions.size()); + + AlterExpression expr = alterExpressions.get(0); + assertEquals(AlterOperation.ADD, expr.getOperation()); + + Index index = expr.getIndex(); + assertEquals("idx_name", index.getName()); + assertEquals("INDEX", index.getIndexKeyword()); + assertEquals("BTREE", index.getUsing()); + assertEquals(List.of("col"), index.getColumnsNames()); + + assertSqlCanBeParsedAndDeparsed(sql); + } }