Skip to content

Commit 7b0e42f

Browse files
minleejaemj-db
minleejae
and
mj-db
authored
Fix issue 2106: Add parsing functionality for MySQL ADD PARTITION and DROP PARTITION clauses in ALTER TABLE statements (#2107)
* feat MySQL Alter add partition * fix PartitionDefinition to Serializable --------- Co-authored-by: mj-db <mj.db@kakaocorp.com>
1 parent 6eb5887 commit 7b0e42f

File tree

5 files changed

+199
-27
lines changed

5 files changed

+199
-27
lines changed

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,18 @@
99
*/
1010
package net.sf.jsqlparser.statement.alter;
1111

12-
import java.io.Serializable;
13-
import java.util.ArrayList;
14-
import java.util.Arrays;
15-
import java.util.Collection;
16-
import java.util.Collections;
17-
import java.util.LinkedHashSet;
18-
import java.util.List;
19-
import java.util.Optional;
20-
import java.util.Set;
21-
2212
import net.sf.jsqlparser.statement.ReferentialAction;
2313
import net.sf.jsqlparser.statement.ReferentialAction.Action;
2414
import net.sf.jsqlparser.statement.ReferentialAction.Type;
2515
import net.sf.jsqlparser.statement.create.table.ColDataType;
2616
import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
2717
import net.sf.jsqlparser.statement.create.table.Index;
18+
import net.sf.jsqlparser.statement.create.table.PartitionDefinition;
2819
import net.sf.jsqlparser.statement.select.PlainSelect;
2920

21+
import java.io.Serializable;
22+
import java.util.*;
23+
3024
@SuppressWarnings({"PMD.CyclomaticComplexity"})
3125
public class AlterExpression implements Serializable {
3226

@@ -55,6 +49,7 @@ public class AlterExpression implements Serializable {
5549
private boolean uk;
5650
private boolean useEqual;
5751

52+
private List<PartitionDefinition> partitionDefinitions;
5853
private List<ConstraintState> constraints;
5954
private List<String> parameters;
6055
private String characterSet;
@@ -789,6 +784,14 @@ public AlterExpression addConstraints(Collection<? extends ConstraintState> cons
789784
return this.withConstraints(collection);
790785
}
791786

787+
public List<PartitionDefinition> getPartitionDefinitions() {
788+
return partitionDefinitions;
789+
}
790+
791+
public void setPartitionDefinitions(List<PartitionDefinition> partitionDefinition) {
792+
this.partitionDefinitions = partitionDefinition;
793+
}
794+
792795
public static final class ColumnDataType extends ColumnDefinition {
793796

794797
private final boolean withType;

‎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, 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, TRUNCATE_PARTITION, LOCK;
1414

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

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package net.sf.jsqlparser.statement.create.table;
2+
3+
import java.io.Serializable;
4+
import java.util.List;
5+
6+
public class PartitionDefinition implements Serializable {
7+
private String partitionName;
8+
private String partitionOperation;
9+
private List<String> values;
10+
11+
public PartitionDefinition(String partitionName, String partitionOperation,
12+
List<String> values) {
13+
this.partitionName = partitionName;
14+
this.partitionOperation = partitionOperation;
15+
this.values = values;
16+
}
17+
18+
public String getPartitionName() {
19+
return partitionName;
20+
}
21+
22+
public void setPartitionName(String partitionName) {
23+
this.partitionName = partitionName;
24+
}
25+
26+
public String getPartitionOperation() {
27+
return partitionOperation;
28+
}
29+
30+
public void setPartitionOperation(String partitionOperation) {
31+
this.partitionOperation = partitionOperation;
32+
}
33+
34+
public List<String> getValues() {
35+
return values;
36+
}
37+
38+
public void setValues(List<String> values) {
39+
this.values = values;
40+
}
41+
}

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

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
321321
| <K_LATERAL:"LATERAL">
322322
| <K_LEADING:"LEADING">
323323
| <K_LEFT:"LEFT">
324+
| <K_LESS:"LESS">
324325
| <K_LIKE:"LIKE">
325326
| <K_LIMIT:"LIMIT">
326327
| <K_LOCAL:"LOCAL">
@@ -465,6 +466,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
465466
| <K_TEMP:"TEMP">
466467
| <K_TEXT_LITERAL: "TEXT" | "TINYTEXT" | "MEDIUMTEXT" | "LONGTEXT" >
467468
| <K_TEMPORARY:"TEMPORARY">
469+
| <K_THAN:"THAN">
468470
| <K_TIME_KEY_EXPR : (
469471
("CURRENT" ( "_" | (" ")+ ) "TIMESTAMP")
470472
| ("CURRENT" ( "_" | (" ")+ ) "TIME")
@@ -2019,7 +2021,7 @@ String RelObjectNameWithoutValue() :
20192021
{ Token tk = null; }
20202022
{
20212023
( 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>
2022-
| 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="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="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="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" )
2024+
| 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="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" )
20232025
{ return tk.image; }
20242026
}
20252027

@@ -7013,6 +7015,47 @@ Index IndexWithComment(Index index):
70137015
}
70147016
}
70157017

7018+
List<PartitionDefinition> PartitionDefinitions():
7019+
{
7020+
Token tk;
7021+
List<PartitionDefinition> partitionDefinitions = new ArrayList<PartitionDefinition>();
7022+
PartitionDefinition partitionDef = null;
7023+
String partitionName = null;
7024+
String partitionOperation = null;
7025+
}
7026+
{
7027+
"("
7028+
(
7029+
<K_PARTITION>
7030+
partitionName=RelObjectName()
7031+
{
7032+
List<String> values = new ArrayList<String>();
7033+
}
7034+
<K_VALUES>
7035+
(
7036+
<K_LESS> <K_THAN>
7037+
(
7038+
"("
7039+
( tk=<S_CHAR_LITERAL> { values.add(tk.image); }
7040+
| tk=<S_LONG> { values.add(tk.image); }
7041+
[ "," ] )* ")"
7042+
| <K_MAXVALUE> { values.add("MAXVALUE"); }
7043+
) {
7044+
partitionOperation = "VALUES LESS THAN";
7045+
}
7046+
)
7047+
{
7048+
partitionDef = new PartitionDefinition(partitionName, partitionOperation, values);
7049+
partitionDefinitions.add(partitionDef);
7050+
}
7051+
[ "," ]
7052+
)*
7053+
")"
7054+
{
7055+
return partitionDefinitions;
7056+
}
7057+
}
7058+
70167059
/**
70177060
* This production needs refactoring to multiple smaller productions. The target class should
70187061
* be splitted as well.
@@ -7034,6 +7077,7 @@ AlterExpression AlterExpression():
70347077
AlterExpression.ColumnDropNotNull alterExpressionColumnDropNotNull = null;
70357078
AlterExpression.ColumnDropDefault alterExpressionColumnDropDefault = null;
70367079
ReferentialAction.Action action = null;
7080+
List<PartitionDefinition> partitionDefinition = null;
70377081
String truncatePartitionName = null;
70387082

70397083
// for captureRest()
@@ -7044,7 +7088,9 @@ AlterExpression AlterExpression():
70447088
(
70457089
(
70467090
(
7047-
<K_ADD> { alterExp.setOperation(AlterOperation.ADD); }
7091+
<K_ADD> { alterExp.setOperation(AlterOperation.ADD);
7092+
System.out.println("test");
7093+
}
70487094
|
70497095
<K_ALTER> { alterExp.setOperation(AlterOperation.ALTER); }
70507096
|
@@ -7074,6 +7120,16 @@ AlterExpression AlterExpression():
70747120
sk3=RelObjectName() <K_COMMENT> tk=<S_CHAR_LITERAL> { alterExp.withColumnName(sk3).withCommentText(tk.image); }
70757121
)
70767122
|
7123+
(
7124+
<K_PARTITION> {
7125+
System.out.println("test _ Partition");
7126+
alterExp.setOperation(AlterOperation.ADD_PARTITION);
7127+
}
7128+
partitionDefinition=PartitionDefinitions() {
7129+
alterExp.setPartitionDefinitions(partitionDefinition);
7130+
}
7131+
)
7132+
|
70777133
LOOKAHEAD(3) (
70787134
( LOOKAHEAD(2)
70797135
(

0 commit comments

Comments
 (0)