Skip to content

Commit da4caf2

Browse files
mj-dbmj-db
committed
add alter table option
1 parent bc0c5d2 commit da4caf2

File tree

4 files changed

+107
-2
lines changed

4 files changed

+107
-2
lines changed

‎src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class AlterExpression implements Serializable {
5757
private String collation;
5858
private String lockOption;
5959
private String commentText;
60+
private String tableOption;
6061

6162
private boolean hasColumn = false;
6263
private boolean hasColumns = false;
@@ -114,6 +115,14 @@ public void setCommentText(String commentText) {
114115
this.commentText = commentText;
115116
}
116117

118+
public String getTableOption() {
119+
return tableOption;
120+
}
121+
122+
public void setTableOption(String tableOption) {
123+
this.tableOption = tableOption;
124+
}
125+
117126
public AlterOperation getOperation() {
118127
return operation;
119128
}

‎src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
package net.sf.jsqlparser.statement.alter;
1111

1212
public enum AlterOperation {
13-
ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, TRUNCATE_PARTITION, LOCK;
13+
ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, TRUNCATE_PARTITION, SET_TABLE_OPTION, LOCK;
1414

1515
public static AlterOperation from(String operation) {
1616
return Enum.valueOf(AlterOperation.class, operation.toUpperCase());

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

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
173173
| <K_ASC:"ASC">
174174
| <K_AUTHORIZATION:"AUTHORIZATION">
175175
| <K_AUTO:"AUTO">
176+
| <K_AUTO_INCREMENT:"AUTO_INCREMENT">
176177
| <K_BASE64:"BASE64">
177178
| <K_BEGIN:"BEGIN">
178179
| <K_BERNOULLI: "BERNOULLI">
@@ -244,6 +245,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
244245
| <K_ELSE:"ELSE">
245246
| <K_EMIT: "EMIT">
246247
| <K_ENABLE: "ENABLE">
248+
| <K_ENCRYPTION: "ENCRYPTION">
247249
| <K_END: "END">
248250
| <K_ENGINE: "ENGINE">
249251
| <K_ERROR: "ERROR">
@@ -2022,7 +2024,7 @@ String RelObjectNameWithoutValue() :
20222024
{ Token tk = null; }
20232025
{
20242026
( 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>
2025-
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | tk="ALGORITHM" | tk="ALTER" | tk="ANALYZE" | tk="APPLY" | tk="APPROXIMATE" | tk="ARCHIVE" | tk="ARRAY" | tk="ASC" | tk="AT" | tk="AUTHORIZATION" | tk="AUTO" | 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="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | 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="DISCONNECT" | tk="DIV" | tk="DML" | tk="DO" | tk="DOMAIN" | tk="DROP" | tk="DUMP" | tk="DUPLICATE" | tk="ELEMENTS" | tk="EMIT" | tk="ENABLE" | tk="END" | tk="ENGINE" | tk="ERROR" | tk="ESCAPE" | tk="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | 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_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | 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="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | 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="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="TRUE" | 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="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" )
2027+
| tk="ACTION" | tk="ACTIVE" | tk="ADD" | tk="ADVANCE" | tk="ADVISE" | tk="AGAINST" | 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="COLLATE" | tk="COLUMN" | tk="COLUMNS" | tk="COMMENT" | tk="COMMIT" | tk="CONCURRENTLY" | tk="CONFLICT" | tk="CONSTRAINTS" | tk="CONVERT" | 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="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="EXCLUDE" | tk="EXEC" | tk="EXECUTE" | tk="EXPLAIN" | tk="EXPLICIT" | tk="EXTENDED" | tk="EXTRACT" | tk="FALSE" | 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_PRIORITY" | tk="HISTORY" | tk="HOPPING" | tk="INCLUDE" | tk="INCLUDE_NULL_VALUES" | tk="INCREMENT" | tk="INDEX" | tk="INSERT" | tk="INTERLEAVE" | tk="INTERPRET" | tk="INVALIDATE" | tk="ISNULL" | tk="JSON" | tk="JSON_ARRAY" | tk="JSON_ARRAYAGG" | tk="JSON_OBJECT" | tk="JSON_OBJECTAGG" | tk="KEEP" | tk="KEY" | tk="KEYS" | tk="LAST" | tk="LEADING" | tk="LESS" | tk="LINK" | tk="LOCAL" | tk="LOCK" | tk="LOCKED" | tk="LOG" | tk="LONGTEXT" | tk="LOOP" | tk="LOW_PRIORITY" | tk="MATCH" | tk="MATCHED" | tk="MATERIALIZED" | tk="MAX" | tk="MAXVALUE" | tk="MEDIUMTEXT" | tk="MEMBER" | tk="MERGE" | tk="MIN" | tk="MINVALUE" | tk="MODIFY" | tk="MOVEMENT" | 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="PARALLEL" | tk="PARENT" | tk="PARTITION" | tk="PATH" | tk="PERCENT" | tk="PLACING" | tk="PLAN" | tk="PRECEDING" | tk="PRIMARY" | tk="PURGE" | tk="QUERY" | tk="QUICK" | tk="QUIESCE" | tk="RANGE" | tk="RAW" | tk="READ" | tk="RECURSIVE" | tk="RECYCLEBIN" | tk="REFERENCES" | tk="REFRESH" | tk="REGEXP" | tk="REGEXP_LIKE" | tk="REGISTER" | tk="REMOTE" | tk="RENAME" | 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="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="TRUE" | 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="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" )
20262028
{ return tk.image; }
20272029
}
20282030

@@ -7421,6 +7423,39 @@ AlterExpression AlterExpression():
74217423
tk=<S_CHAR_LITERAL> { alterExp.setCommentText(tk.image); }
74227424
)
74237425
|
7426+
(<K_ENCRYPTION> {alterExp.setOperation(AlterOperation.SET_TABLE_OPTION);}
7427+
["=" { alterExp.setUseEqual(true);} ]
7428+
tk=<S_CHAR_LITERAL> {
7429+
if (alterExp.getUseEqual()) {
7430+
alterExp.setTableOption("ENCRYPTION = " + tk.image);
7431+
} else {
7432+
alterExp.setTableOption("ENCRYPTION " + tk.image);
7433+
}
7434+
}
7435+
)
7436+
|
7437+
(<K_AUTO_INCREMENT> {alterExp.setOperation(AlterOperation.SET_TABLE_OPTION);}
7438+
["=" { alterExp.setUseEqual(true);} ]
7439+
tk=<S_LONG> {
7440+
if (alterExp.getUseEqual()) {
7441+
alterExp.setTableOption("AUTO_INCREMENT = " + tk.image);
7442+
} else {
7443+
alterExp.setTableOption("AUTO_INCREMENT " + tk.image);
7444+
}
7445+
}
7446+
)
7447+
|
7448+
(<K_ENGINE> {alterExp.setOperation(AlterOperation.SET_TABLE_OPTION);}
7449+
["=" { alterExp.setUseEqual(true);} ]
7450+
tk=<S_IDENTIFIER> {
7451+
if (alterExp.getUseEqual()) {
7452+
alterExp.setTableOption("ENGINE = " + tk.image);
7453+
} else {
7454+
alterExp.setTableOption("ENGINE " + tk.image);
7455+
}
7456+
}
7457+
)
7458+
|
74247459
LOOKAHEAD(2)
74257460
(<K_RENAME> ((<K_INDEX> {alterExp.setOperation(AlterOperation.RENAME_INDEX);}
74267461
| <K_KEY> {alterExp.setOperation(AlterOperation.RENAME_KEY);})

‎src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,4 +1275,65 @@ public void testIssue2106AlterTableTruncatePartition() throws JSQLParserExceptio
12751275
assertEquals("p201801", partitionNames.get(2));
12761276
assertEquals("p201807", partitionNames.get(3));
12771277
}
1278+
1279+
1280+
@Test
1281+
public void testIssue2114AlterTableEncryption() throws JSQLParserException {
1282+
String sql = "ALTER TABLE confidential_data ENCRYPTION = 'Y'";
1283+
Statement stmt = CCJSqlParserUtil.parse(sql);
1284+
assertTrue(stmt instanceof Alter);
1285+
Alter alter = (Alter) stmt;
1286+
List<AlterExpression> alterExpressions = alter.getAlterExpressions();
1287+
assertNotNull(alterExpressions);
1288+
assertEquals(1, alterExpressions.size());
1289+
1290+
AlterExpression encryptionExp = alterExpressions.get(0);
1291+
assertEquals(AlterOperation.SET_TABLE_OPTION, encryptionExp.getOperation());
1292+
assertEquals(encryptionExp.getTableOption(), "ENCRYPTION = 'Y'");
1293+
}
1294+
1295+
@Test
1296+
public void testIssue2114AlterTableEncryptionWithoutEqual() throws JSQLParserException {
1297+
String sql = "ALTER TABLE confidential_data ENCRYPTION 'N'";
1298+
Statement stmt = CCJSqlParserUtil.parse(sql);
1299+
assertTrue(stmt instanceof Alter);
1300+
Alter alter = (Alter) stmt;
1301+
List<AlterExpression> alterExpressions = alter.getAlterExpressions();
1302+
assertNotNull(alterExpressions);
1303+
assertEquals(1, alterExpressions.size());
1304+
1305+
AlterExpression encryptionExp = alterExpressions.get(0);
1306+
assertEquals(AlterOperation.SET_TABLE_OPTION, encryptionExp.getOperation());
1307+
assertEquals(encryptionExp.getTableOption(), "ENCRYPTION 'N'");
1308+
}
1309+
1310+
@Test
1311+
public void testIssue2114AlterTableAutoIncrement() throws JSQLParserException {
1312+
String sql = "ALTER TABLE tt AUTO_INCREMENT = 101";
1313+
Statement stmt = CCJSqlParserUtil.parse(sql);
1314+
assertTrue(stmt instanceof Alter);
1315+
Alter alter = (Alter) stmt;
1316+
List<AlterExpression> alterExpressions = alter.getAlterExpressions();
1317+
assertNotNull(alterExpressions);
1318+
assertEquals(1, alterExpressions.size());
1319+
1320+
AlterExpression autoIncrementExp = alterExpressions.get(0);
1321+
assertEquals(AlterOperation.SET_TABLE_OPTION, autoIncrementExp.getOperation());
1322+
assertEquals(autoIncrementExp.getTableOption(), "AUTO_INCREMENT = 101");
1323+
}
1324+
1325+
@Test
1326+
public void testIssue2114AlterTableEngine() throws JSQLParserException {
1327+
String sql = "ALTER TABLE city2 ENGINE = InnoDB";
1328+
Statement stmt = CCJSqlParserUtil.parse(sql);
1329+
assertTrue(stmt instanceof Alter);
1330+
Alter alter = (Alter) stmt;
1331+
List<AlterExpression> alterExpressions = alter.getAlterExpressions();
1332+
assertNotNull(alterExpressions);
1333+
assertEquals(1, alterExpressions.size());
1334+
1335+
AlterExpression engineExp = alterExpressions.get(0);
1336+
assertEquals(AlterOperation.SET_TABLE_OPTION, engineExp.getOperation());
1337+
assertEquals(engineExp.getTableOption(), "ENGINE = InnoDB");
1338+
}
12781339
}

0 commit comments

Comments
 (0)