Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -13306,20 +13306,30 @@ AlterExpression AlterExpressionAddAlterModify():
LOOKAHEAD(3) AlterExpressionColumnChanges(alterExp)
|
(
<K_UNIQUE>
<K_UNIQUE> { index = new Index().withType("UNIQUE"); }
(
(
<K_KEY> { alterExp.setUk(true); }
| <K_INDEX> { alterExp.setUk(false); }
tk2=<K_KEY> { alterExp.setUk(true); }
| tk2=<K_INDEX> { alterExp.setUk(false); }
)
[ (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) { alterExp.setUkName(tk.image); } ]
[ (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) {
sk3 = tk.image;
alterExp.setUkName(sk3);
} ]
|
(tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>) {
sk3 = tk.image;
alterExp.setUkTypeSpecified(false);
alterExp.setUkName(tk.image);
alterExp.setUkName(sk3);
}
)?
columnNames=ColumnsNamesList() { alterExp.setUkColumns(columnNames); }
columnNames=ColumnsNamesList() {
alterExp.setUkColumns(columnNames);
index.withIndexKeyword(tk2 != null ? tk2.image : null)
.withName(sk3)
.withColumnsNames(columnNames);
alterExp.setIndex(index);
}
[
AlterExpressionUsingIndex(alterExp)
]
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,28 @@ public void testAlterTableDropAndAddUniqueIndexWithAscendingColumns() throws Exc
result.toString());
}

@Test
public void testAlterTableAddUniqueIndexWithCommentIssue2503() throws Exception {
String sql = "ALTER TABLE `wxp_dm`.`xqgl_req_report` "
+ "ADD UNIQUE INDEX `index2` (`report_name` ASC) USING BTREE COMMENT '唯一索引'";

Alter alter = (Alter) assertSqlCanBeParsedAndDeparsed(sql);
AlterExpression alterExpression = alter.getAlterExpressions().get(0);
Index index = alterExpression.getIndex();

assertNotNull(index);
assertEquals("UNIQUE", index.getType());
assertEquals("INDEX", index.getIndexKeyword());
assertEquals("`index2`", index.getName());
assertEquals(List.of("`report_name` ASC"), index.getColumnsNames());
assertEquals("'唯一索引'", index.getCommentText());

// Keep the legacy fields populated for existing consumers.
assertEquals("`index2`", alterExpression.getUkName());
assertEquals(List.of("`report_name` ASC"), alterExpression.getUkColumns());
assertEquals(List.of("USING", "BTREE"), alterExpression.getParameters());
}

@Test
public void testIssue259() throws JSQLParserException {
assertSqlCanBeParsedAndDeparsed(
Expand Down
Loading