From a29a520206ec3b6a2f3d635fff64564f2ac575e5 Mon Sep 17 00:00:00 2001 From: minleejae Date: Wed, 2 Apr 2025 22:11:01 +0900 Subject: [PATCH] Add support for MySQL ALTER TABLE partition options in parser --- .../statement/alter/AlterExpression.java | 100 +++++++-- .../statement/alter/AlterOperation.java | 2 +- .../create/table/PartitionDefinition.java | 14 ++ .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 143 +++++++++++-- .../jsqlparser/statement/alter/AlterTest.java | 202 ++++++++++++++++++ 5 files changed, 429 insertions(+), 32 deletions(-) diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java index 5f0c09d7d..cf936ecf2 100644 --- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java +++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpression.java @@ -9,6 +9,7 @@ */ package net.sf.jsqlparser.statement.alter; +import java.util.stream.Collectors; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.ReferentialAction; import net.sf.jsqlparser.statement.ReferentialAction.Action; @@ -79,6 +80,11 @@ public class AlterExpression implements Serializable { private String partitionType; private Expression partitionExpression; private List partitionColumns; + private int coalescePartitionNumber; + + private String exchangePartitionTableName; + private boolean exchangePartitionWithValidation; + private boolean exchangePartitionWithoutValidation; public Index getOldIndex() { @@ -524,6 +530,38 @@ public List getPartitionColumns() { return partitionColumns; } + public void setExchangePartitionTableName(String exchangePartitionTableName) { + this.exchangePartitionTableName = exchangePartitionTableName; + } + + public String getExchangePartitionTableName() { + return exchangePartitionTableName; + } + + public void setCoalescePartitionNumber(int coalescePartitionNumber) { + this.coalescePartitionNumber = coalescePartitionNumber; + } + + public int getCoalescePartitionNumber() { + return coalescePartitionNumber; + } + + public void setExchangePartitionWithValidation(boolean exchangePartitionWithValidation) { + this.exchangePartitionWithValidation = exchangePartitionWithValidation; + } + + public boolean isExchangePartitionWithValidation() { + return exchangePartitionWithValidation; + } + + public void setExchangePartitionWithoutValidation(boolean exchangePartitionWithoutValidation) { + this.exchangePartitionWithoutValidation = exchangePartitionWithoutValidation; + } + + public boolean isExchangePartitionWithoutValidation() { + return exchangePartitionWithoutValidation; + } + @Override @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity", "PMD.ExcessiveMethodLength", "PMD.SwitchStmtsShouldHaveDefault"}) @@ -628,9 +666,51 @@ public String toString() { && !pkColumns.isEmpty()) { // Oracle Multi Column Drop b.append("DROP (").append(PlainSelect.getStringList(pkColumns)).append(')'); + } else if (operation == AlterOperation.DISCARD_PARTITION && partitions != null) { + b.append("DISCARD PARTITION ").append(PlainSelect.getStringList(partitions)); + if (tableOption != null) { + b.append(" ").append(tableOption); + } + } else if (operation == AlterOperation.IMPORT_PARTITION) { + b.append("IMPORT PARTITION ").append(PlainSelect.getStringList(partitions)); + if (tableOption != null) { + b.append(" ").append(tableOption); + } } else if (operation == AlterOperation.TRUNCATE_PARTITION && partitions != null) { b.append("TRUNCATE PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.COALESCE_PARTITION) { + b.append("COALESCE PARTITION ").append(coalescePartitionNumber); + } else if (operation == AlterOperation.REORGANIZE_PARTITION + && partitions != null + && partitionDefinitions != null) { + b.append("REORGANIZE PARTITION ") + .append(PlainSelect.getStringList(partitions)) + .append(" INTO (") + .append(partitionDefinitions.stream() + .map(PartitionDefinition::toString) + .collect(Collectors.joining(", "))) + .append(")"); + } else if (operation == AlterOperation.EXCHANGE_PARTITION) { + b.append("EXCHANGE PARTITION "); + b.append(partitions.get(0)).append(" WITH TABLE ").append(exchangePartitionTableName); + if (exchangePartitionWithValidation) { + b.append(" WITH VALIDATION "); + } else if (exchangePartitionWithoutValidation) { + b.append(" WITHOUT VALIDATION "); + } + } else if (operation == AlterOperation.ANALYZE_PARTITION && partitions != null) { + b.append("ANALYZE PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.CHECK_PARTITION && partitions != null) { + b.append("CHECK PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.OPTIMIZE_PARTITION && partitions != null) { + b.append("OPTIMIZE PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.REBUILD_PARTITION && partitions != null) { + b.append("REBUILD PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.REPAIR_PARTITION && partitions != null) { + b.append("REPAIR PARTITION ").append(PlainSelect.getStringList(partitions)); + } else if (operation == AlterOperation.REMOVE_PARTITIONING) { + b.append("REMOVE PARTITIONING"); } else if (operation == AlterOperation.PARTITION_BY) { b.append("PARTITION BY ").append(partitionType).append(" "); if (partitionExpression != null) { @@ -638,21 +718,11 @@ public String toString() { } else if (partitionColumns != null && !partitionColumns.isEmpty()) { b.append("COLUMNS(").append(String.join(", ", partitionColumns)).append(") "); } - b.append("("); - for (int i = 0; i < partitionDefinitions.size(); i++) { - PartitionDefinition partition = partitionDefinitions.get(i); - b.append("PARTITION ").append(partition.getPartitionName()) - .append(" ").append(partition.getPartitionOperation()) - .append(" (").append(PlainSelect.getStringList(partition.getValues())) - .append(")"); - if (partition.getStorageEngine() != null) { - b.append(" ENGINE = ").append(partition.getStorageEngine()); - } - if (i < partitionDefinitions.size() - 1) { - b.append(", "); - } - } - b.append(")"); + + b.append("(").append(partitionDefinitions.stream() + .map(PartitionDefinition::toString) + .collect(Collectors.joining(", "))) + .append(")"); } else { if (operation == AlterOperation.COMMENT_WITH_EQUAL_SIGN) { b.append("COMMENT =").append(" "); diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java index a9d955c36..2e26e74b6 100644 --- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java +++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterOperation.java @@ -10,7 +10,7 @@ package net.sf.jsqlparser.statement.alter; public enum AlterOperation { - ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, COLLATE, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, PARTITION_BY, TRUNCATE_PARTITION, SET_TABLE_OPTION, ENGINE, FORCE, LOCK, DISCARD_TABLESPACE, IMPORT_TABLESPACE, DISABLE_KEYS, ENABLE_KEYS; + ADD, ALTER, DROP, DROP_PRIMARY_KEY, DROP_UNIQUE, DROP_FOREIGN_KEY, MODIFY, CHANGE, CONVERT, COLLATE, ALGORITHM, RENAME, RENAME_TABLE, RENAME_INDEX, RENAME_KEY, RENAME_CONSTRAINT, COMMENT, COMMENT_WITH_EQUAL_SIGN, UNSPECIFIC, ADD_PARTITION, DROP_PARTITION, DISCARD_PARTITION, IMPORT_PARTITION, TRUNCATE_PARTITION, COALESCE_PARTITION, REORGANIZE_PARTITION, EXCHANGE_PARTITION, ANALYZE_PARTITION, CHECK_PARTITION, OPTIMIZE_PARTITION, REBUILD_PARTITION, REPAIR_PARTITION, REMOVE_PARTITIONING, PARTITION_BY, SET_TABLE_OPTION, ENGINE, FORCE, LOCK, DISCARD_TABLESPACE, IMPORT_TABLESPACE, DISABLE_KEYS, ENABLE_KEYS; public static AlterOperation from(String operation) { return Enum.valueOf(AlterOperation.class, operation.toUpperCase()); diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionDefinition.java b/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionDefinition.java index a79f242ed..24d15dfd0 100644 --- a/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionDefinition.java +++ b/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionDefinition.java @@ -11,6 +11,7 @@ import java.io.Serializable; import java.util.List; +import net.sf.jsqlparser.statement.select.PlainSelect; public class PartitionDefinition implements Serializable { private String partitionName; @@ -57,4 +58,17 @@ public String getStorageEngine() { public void setStorageEngine(String storageEngine) { this.storageEngine = storageEngine; } + + @Override + public String toString() { + StringBuilder b = new StringBuilder(); + b.append("PARTITION ").append(partitionName) + .append(" ").append(partitionOperation) + .append(" (").append(PlainSelect.getStringList(values)) + .append(")"); + if (storageEngine != null) { + b.append(" ENGINE = ").append(storageEngine); + } + return b.toString(); + } } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index dd7d74357..6cf725334 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -203,6 +203,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -256,6 +257,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | /* Salesforce SOQL */ | @@ -398,6 +400,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -418,6 +421,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -428,7 +432,10 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | +| +| | | | @@ -521,6 +528,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -2139,7 +2147,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="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="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="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="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="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="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="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="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" ) { return tk.image; } } @@ -7691,14 +7699,20 @@ List PartitionNamesList() : List partitionNames = new ArrayList(); } { - tk = { - partitionNames.add(tk.image); - } ( - LOOKAHEAD(2) "," tk = { + tk = { partitionNames.add(tk.image); } - )* + | + tk = { + partitionNames.add(tk.image); + } + ( + LOOKAHEAD(2) "," tk = { + partitionNames.add(tk.image); + } + )* + ) { return partitionNames; } @@ -8108,18 +8122,50 @@ AlterExpression AlterExpression(): ) | ( - (tk = ) - (tk2 = ) { - alterExp.setOperation(AlterOperation.DISCARD_TABLESPACE); - } + + ( + + { + alterExp.setOperation(AlterOperation.DISCARD_PARTITION); + } + partitions = PartitionNamesList() + { + alterExp.setPartitions(partitions); + } + + { + alterExp.setTableOption("TABLESPACE"); + } + | + + { + alterExp.setOperation(AlterOperation.DISCARD_TABLESPACE); + } + ) ) | - ( - (tk = ) - (tk2 = ) { - alterExp.setOperation(AlterOperation.IMPORT_TABLESPACE); - } - ) + ( + + ( + + { + alterExp.setOperation(AlterOperation.IMPORT_PARTITION); + } + partitions = PartitionNamesList() + { + alterExp.setPartitions(partitions); + } + + { + alterExp.setTableOption("TABLESPACE"); + } + | + + { + alterExp.setOperation(AlterOperation.IMPORT_TABLESPACE); + } + ) + ) | ( (tk = ) @@ -8188,6 +8234,71 @@ AlterExpression AlterExpression(): alterExp.setPartitions(partitions); } | + LOOKAHEAD(2) tk= { + alterExp.setOperation(AlterOperation.COALESCE_PARTITION); + alterExp.setCoalescePartitionNumber(Integer.valueOf(tk.image)); + } + | LOOKAHEAD(2) + partitions=PartitionNamesList() partitionDefinition=PartitionDefinitions() { + alterExp.setOperation(AlterOperation.REORGANIZE_PARTITION); + alterExp.setPartitions(partitions); + alterExp.setPartitionDefinitions(partitionDefinition); + } + | + LOOKAHEAD(2) partitions=PartitionNamesList() + tk= + [ + LOOKAHEAD(2) + { + alterExp.setExchangePartitionWithValidation(true); + } + | + LOOKAHEAD(2) + { + alterExp.setExchangePartitionWithoutValidation(false); + } + ] + { + alterExp.setOperation(AlterOperation.EXCHANGE_PARTITION); + alterExp.setPartitions(partitions); + alterExp.setExchangePartitionTableName(tk.image); + } + | + LOOKAHEAD(2) { + alterExp.setOperation(AlterOperation.ANALYZE_PARTITION); + } + partitions=PartitionNamesList() { + alterExp.setPartitions(partitions); + } + | + LOOKAHEAD(2) { + alterExp.setOperation(AlterOperation.CHECK_PARTITION); + } + partitions=PartitionNamesList() { + alterExp.setPartitions(partitions); + } + | + LOOKAHEAD(2) { + alterExp.setOperation(AlterOperation.OPTIMIZE_PARTITION); + } + partitions=PartitionNamesList() { + alterExp.setPartitions(partitions); + } + | + LOOKAHEAD(2) { + alterExp.setOperation(AlterOperation.REBUILD_PARTITION); + } + partitions=PartitionNamesList() { + alterExp.setPartitions(partitions); + } + | + LOOKAHEAD(2) { alterExp.setOperation(AlterOperation.REPAIR_PARTITION); } + partitions=PartitionNamesList() { + alterExp.setPartitions(partitions); + } + | + LOOKAHEAD(2) { alterExp.setOperation(AlterOperation.REMOVE_PARTITIONING); } + | tokens = captureRest() { alterExp.setOperation(AlterOperation.UNSPECIFIC); StringBuilder optionalSpecifier = new StringBuilder(); 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 7ebcd7e1b..d2a69a51a 100644 --- a/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java @@ -1605,4 +1605,206 @@ public void testAlterTablePartitionByRangeUnixTimestamp2() throws JSQLParserExce assertSqlCanBeParsedAndDeparsed(sql); } + + @Test + public void testAlterTableDiscardPartitionTablespace() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name DISCARD PARTITION p1 TABLESPACE"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.DISCARD_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertEquals("TABLESPACE", alterExpression.getTableOption()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableDiscardAllPartitionTablespace() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name DISCARD PARTITION ALL TABLESPACE"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.DISCARD_PARTITION, alterExpression.getOperation()); + assertEquals("ALL", alterExpression.getPartitions().get(0)); + assertEquals("TABLESPACE", alterExpression.getTableOption()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableImportMultiplePartitionsTablespace() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name IMPORT PARTITION p1, p2 TABLESPACE"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.IMPORT_PARTITION, alterExpression.getOperation()); + + List partitions = alterExpression.getPartitions(); + assertNotNull(partitions); + assertEquals(2, partitions.size()); + assertEquals("p1", partitions.get(0)); + assertEquals("p2", partitions.get(1)); + + assertEquals("TABLESPACE", alterExpression.getTableOption()); + + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableTruncatePartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name TRUNCATE PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.TRUNCATE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableCoalescePartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name COALESCE PARTITION 2"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.COALESCE_PARTITION, alterExpression.getOperation()); + assertEquals(2, alterExpression.getCoalescePartitionNumber()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableReorganizePartition() throws JSQLParserException { + String sql = + "ALTER TABLE tbl_name REORGANIZE PARTITION p1 INTO (PARTITION p2 VALUES LESS THAN (100))"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.REORGANIZE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + PartitionDefinition partitionDef = alterExpression.getPartitionDefinitions().get(0); + assertEquals("p2", partitionDef.getPartitionName()); + assertEquals("VALUES LESS THAN", partitionDef.getPartitionOperation()); + assertEquals(Collections.singletonList("100"), partitionDef.getValues()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableExchangePartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name EXCHANGE PARTITION p1 WITH TABLE tbl_name2"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.EXCHANGE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertEquals("tbl_name2", alterExpression.getExchangePartitionTableName()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableExchangePartitionWithValidation() throws JSQLParserException { + String sql = + "ALTER TABLE tbl_name EXCHANGE PARTITION p1 WITH TABLE tbl_name2 WITH VALIDATION"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.EXCHANGE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertEquals("tbl_name2", alterExpression.getExchangePartitionTableName()); + assertTrue(alterExpression.isExchangePartitionWithValidation()); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableAnalyzePartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name ANALYZE PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.ANALYZE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableCheckPartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name CHECK PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.CHECK_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableOptimizePartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name OPTIMIZE PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.OPTIMIZE_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableRebuildPartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name REBUILD PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.REBUILD_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableRepairPartition() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name REPAIR PARTITION p1"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.REPAIR_PARTITION, alterExpression.getOperation()); + assertEquals("p1", alterExpression.getPartitions().get(0)); + assertSqlCanBeParsedAndDeparsed(sql); + } + + @Test + public void testAlterTableRemovePartitioning() throws JSQLParserException { + String sql = "ALTER TABLE tbl_name REMOVE PARTITIONING"; + Statement stmt = CCJSqlParserUtil.parse(sql); + assertInstanceOf(Alter.class, stmt); + Alter alter = (Alter) stmt; + assertEquals("tbl_name", alter.getTable().getFullyQualifiedName()); + AlterExpression alterExpression = alter.getAlterExpressions().get(0); + assertEquals(AlterOperation.REMOVE_PARTITIONING, alterExpression.getOperation()); + assertSqlCanBeParsedAndDeparsed(sql); + } }