Skip to content

Commit 51e6420

Browse files
minleejaeminleejae
authored
Reuse MySQL table option parsing across CREATE and ALTER TABLE (#2715)
* fix: reuse MySQL table option parsing across CREATE and ALTER TABLE Signed-off-by: minleejae <mmj9808@gmail.com> * fix: declare table option fields before methods Signed-off-by: minleejae <mmj9808@gmail.com> --------- Signed-off-by: minleejae <mmj9808@gmail.com>
1 parent 78d3de8 commit 51e6420

5 files changed

Lines changed: 363 additions & 99 deletions

File tree

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,76 @@ public void setStructuredTableOption(TableOption option) {
3232
super.setUseEqual(false);
3333
}
3434

35+
@Override
36+
public AlterOperation getOperation() {
37+
if (structuredTableOption != null) {
38+
switch (structuredTableOption.getKind()) {
39+
case ENGINE:
40+
return AlterOperation.ENGINE;
41+
case KEY_BLOCK_SIZE:
42+
return AlterOperation.KEY_BLOCK_SIZE;
43+
case COMMENT:
44+
return structuredTableOption.isUseEquals()
45+
? AlterOperation.COMMENT_WITH_EQUAL_SIGN
46+
: AlterOperation.COMMENT;
47+
default:
48+
return AlterOperation.SET_TABLE_OPTION;
49+
}
50+
}
51+
return super.getOperation();
52+
}
53+
54+
@Override
55+
public String getEngineOption() {
56+
return structuredTableOption != null
57+
&& structuredTableOption.getKind() == TableOption.Kind.ENGINE
58+
? structuredTableOption.getValue()
59+
: super.getEngineOption();
60+
}
61+
62+
@Override
63+
public void setEngineOption(String value) {
64+
if (structuredTableOption != null
65+
&& structuredTableOption.getKind() == TableOption.Kind.ENGINE) {
66+
structuredTableOption.setValue(value);
67+
}
68+
super.setEngineOption(value);
69+
}
70+
71+
@Override
72+
public int getKeyBlockSize() {
73+
return structuredTableOption != null
74+
&& structuredTableOption.getKind() == TableOption.Kind.KEY_BLOCK_SIZE
75+
? Integer.parseInt(structuredTableOption.getValue())
76+
: super.getKeyBlockSize();
77+
}
78+
79+
@Override
80+
public void setKeyBlockSize(int value) {
81+
if (structuredTableOption != null
82+
&& structuredTableOption.getKind() == TableOption.Kind.KEY_BLOCK_SIZE) {
83+
structuredTableOption.setValue(Integer.toString(value));
84+
}
85+
super.setKeyBlockSize(value);
86+
}
87+
88+
@Override
89+
public String getCommentText() {
90+
return structuredTableOption != null
91+
&& structuredTableOption.getKind() == TableOption.Kind.COMMENT
92+
? structuredTableOption.getValue()
93+
: super.getCommentText();
94+
}
95+
96+
@Override
97+
public void setCommentText(String value) {
98+
if (structuredTableOption != null
99+
&& structuredTableOption.getKind() == TableOption.Kind.COMMENT) {
100+
structuredTableOption.setValue(value);
101+
}
102+
super.setCommentText(value);
103+
}
104+
35105
@Override
36106
public String getTableOption() {
37107
return structuredTableOption == null ? super.getTableOption()
@@ -60,6 +130,10 @@ public void setUseEqual(boolean useEqual) {
60130

61131
@Override
62132
protected void appendBody(StringBuilder b) {
133+
if (structuredTableOption != null) {
134+
b.append(structuredTableOption);
135+
return;
136+
}
63137
switch (getOperation()) {
64138
case SET_TABLE_OPTION:
65139
b.append(getTableOption());

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

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,20 @@
2020
/** A structured option following a {@code CREATE TABLE} definition. */
2121
public class TableOption implements Serializable {
2222

23+
private ForeignTableOptions foreignTableOptions;
24+
private Kind kind = Kind.OTHER;
25+
private String name;
26+
private String value;
27+
private boolean useEquals;
28+
private List<String> tokens;
29+
private List<Table> unionTables;
30+
private List<Index.Option> storageParameters;
31+
private ColumnOption.Storage tablespaceStorage;
32+
2333
public enum Kind {
24-
ENGINE, CHARACTER_SET, COLLATE, COMMENT, AUTO_INCREMENT, STATS_AUTO_RECALC, STATS_PERSISTENT, STATS_SAMPLE_PAGES, UNION, ENCRYPTION, PASSWORD, DATA_DIRECTORY, INDEX_DIRECTORY, SECONDARY_ENGINE, AUTOEXTEND_SIZE, INSERT_METHOD, PACK_KEYS, DELAY_KEY_WRITE, CHECKSUM, CONNECTION, COMPRESSION, STORAGE_PARAMETERS, WITHOUT_OIDS, ENGINE_ATTRIBUTE, SECONDARY_ENGINE_ATTRIBUTE, ROW_FORMAT, FOREIGN_SERVER, OTHER
34+
ENGINE, CHARACTER_SET, COLLATE, COMMENT, AUTO_INCREMENT, STATS_AUTO_RECALC, STATS_PERSISTENT, STATS_SAMPLE_PAGES, UNION, ENCRYPTION, PASSWORD, DATA_DIRECTORY, INDEX_DIRECTORY, SECONDARY_ENGINE, AUTOEXTEND_SIZE, INSERT_METHOD, PACK_KEYS, DELAY_KEY_WRITE, CHECKSUM, CONNECTION, COMPRESSION, STORAGE_PARAMETERS, WITHOUT_OIDS, ENGINE_ATTRIBUTE, SECONDARY_ENGINE_ATTRIBUTE, ROW_FORMAT, AVG_ROW_LENGTH, MAX_ROWS, MIN_ROWS, KEY_BLOCK_SIZE, TABLESPACE, FOREIGN_SERVER, OTHER
2535
}
2636

27-
private ForeignTableOptions foreignTableOptions;
28-
2937
public ForeignTableOptions getForeignTableOptions() {
3038
return foreignTableOptions;
3139
}
@@ -36,13 +44,17 @@ public static TableOption foreignServer(ForeignTableOptions options) {
3644
return option;
3745
}
3846

39-
private Kind kind = Kind.OTHER;
40-
private String name;
41-
private String value;
42-
private boolean useEquals;
43-
private List<String> tokens;
44-
private List<Table> unionTables;
45-
private List<Index.Option> storageParameters;
47+
public ColumnOption.Storage getTablespaceStorage() {
48+
return tablespaceStorage;
49+
}
50+
51+
public void setTablespaceStorage(ColumnOption.Storage storage) {
52+
if (storage != null && storage != ColumnOption.Storage.DISK
53+
&& storage != ColumnOption.Storage.MEMORY) {
54+
throw new IllegalArgumentException("TABLESPACE storage must be DISK or MEMORY");
55+
}
56+
tablespaceStorage = storage;
57+
}
4658

4759
public List<Index.Option> getStorageParameters() {
4860
return storageParameters;
@@ -51,6 +63,7 @@ public List<Index.Option> getStorageParameters() {
5163
public void setStorageParameters(List<Index.Option> storageParameters) {
5264
this.storageParameters = storageParameters;
5365
foreignTableOptions = null;
66+
tablespaceStorage = null;
5467
kind = Kind.STORAGE_PARAMETERS;
5568
name = "WITH";
5669
value = null;
@@ -96,6 +109,9 @@ public Kind getKind() {
96109

97110
public void setKind(Kind kind) {
98111
this.kind = kind;
112+
if (kind != Kind.TABLESPACE) {
113+
tablespaceStorage = null;
114+
}
99115
if (kind != Kind.FOREIGN_SERVER) {
100116
foreignTableOptions = null;
101117
}
@@ -141,6 +157,7 @@ public List<Table> getUnionTables() {
141157
public void setUnionTables(List<Table> unionTables) {
142158
this.unionTables = unionTables;
143159
foreignTableOptions = null;
160+
tablespaceStorage = null;
144161
kind = Kind.UNION;
145162
name = "UNION";
146163
value = null;
@@ -177,12 +194,17 @@ public List<String> getTokens() {
177194
if (renderedValue != null) {
178195
result.add(renderedValue);
179196
}
197+
if (kind == Kind.TABLESPACE && tablespaceStorage != null) {
198+
result.add("STORAGE");
199+
result.add(tablespaceStorage.name());
200+
}
180201
return Collections.unmodifiableList(result);
181202
}
182203

183204
public void setTokens(List<String> tokens) {
184205
this.tokens = tokens;
185206
if (tokens != null) {
207+
tablespaceStorage = null;
186208
foreignTableOptions = null;
187209
unionTables = null;
188210
storageParameters = null;
@@ -218,6 +240,9 @@ public String toString() {
218240
return PlainSelect.getStringList(tokens, false, false);
219241
}
220242
String renderedValue = getValue();
221-
return name + (renderedValue != null ? (useEquals ? " = " : " ") + renderedValue : "");
243+
return name + (renderedValue != null ? (useEquals ? " = " : " ") + renderedValue : "")
244+
+ (kind == Kind.TABLESPACE && tablespaceStorage != null
245+
? " STORAGE " + tablespaceStorage
246+
: "");
222247
}
223248
}

‎src/main/java/net/sf/jsqlparser/util/TableDefinitionTraversal.java‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ public static void visit(AlterExpression action, Consumer<Expression> expression
6161
relation.visitExpressions(expressions);
6262
relation.visitTables(tables);
6363
}
64+
if (action instanceof net.sf.jsqlparser.statement.alter.AlterExpressionTableOption) {
65+
visit(((net.sf.jsqlparser.statement.alter.AlterExpressionTableOption) action)
66+
.getStructuredTableOption(), expressions, tables);
67+
}
6468
if (action.getOperation() == AlterOperation.RENAME_TABLE) {
6569
accept(action.getNewTable(), tables);
6670
}
@@ -123,12 +127,7 @@ public static void visit(CreateTable table, Consumer<Expression> expressions,
123127
expressions);
124128
}
125129
if (table.getTableOptions() != null) {
126-
table.getTableOptions().forEach(option -> {
127-
visitOptions(option.getStorageParameters(), expressions);
128-
if (option.getUnionTables() != null) {
129-
option.getUnionTables().forEach(source -> accept(source, tables));
130-
}
131-
});
130+
table.getTableOptions().forEach(option -> visit(option, expressions, tables));
132131
}
133132
if (table.getInherits() != null) {
134133
table.getInherits().forEach(parent -> accept(parent, tables));
@@ -142,6 +141,17 @@ public static void visit(CreateTable table, Consumer<Expression> expressions,
142141
visit(table.getPartitionBound(), expressions);
143142
}
144143

144+
/** Shared CREATE/ALTER table option traversal. */
145+
public static void visit(net.sf.jsqlparser.statement.create.table.TableOption option,
146+
Consumer<Expression> expressions, Consumer<Table> tables) {
147+
if (option != null) {
148+
visitOptions(option.getStorageParameters(), expressions);
149+
if (option.getUnionTables() != null) {
150+
option.getUnionTables().forEach(source -> accept(source, tables));
151+
}
152+
}
153+
}
154+
145155
/** Visits the active partition key and any subpartition key. Raw bounds remain opaque. */
146156
public static void visit(TablePartitioning partitioning, Consumer<Expression> expressions) {
147157
if (partitioning == null) {

0 commit comments

Comments
 (0)