Skip to content

Commit c65de44

Browse files
committed
[chore] One more test, code cleanup
1 parent 3f5edea commit c65de44

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

src/main/java/net/sf/jsqlparser/expression/JsonTableFunction.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
import net.sf.jsqlparser.statement.create.table.ColDataType;
1919

2020
public class JsonTableFunction extends Function {
21+
22+
private Expression jsonInputExpression;
23+
private Expression jsonPathExpression;
24+
private String pathName;
25+
private final List<JsonTablePassingClause> passingClauses = new ArrayList<>();
26+
private JsonTableColumnsClause columnsClause;
27+
private JsonTablePlanClause planClause;
28+
private JsonTableOnErrorClause onErrorClause;
29+
private JsonTableParsingTypeClause parsingTypeClause;
30+
private JsonTableOnEmptyClause onEmptyClause;
31+
private boolean formatJson;
32+
2133
public enum JsonTablePlanOperator {
2234
COMMA(", "), INNER(" INNER "), OUTER(" OUTER "), CROSS(" CROSS "), UNION(" UNION ");
2335

@@ -215,8 +227,6 @@ public String toString() {
215227
public static class JsonTableOnEmptyClause extends ASTNodeAccessImpl implements Serializable {
216228
private JsonTableOnEmptyType type;
217229

218-
public JsonTableOnEmptyClause() {}
219-
220230
public JsonTableOnEmptyType getType() {
221231
return type;
222232
}
@@ -236,8 +246,6 @@ public static class JsonTableParsingTypeClause extends ASTNodeAccessImpl
236246
implements Serializable {
237247
private JsonTableParsingType type;
238248

239-
public JsonTableParsingTypeClause() {}
240-
241249
public JsonTableParsingType getType() {
242250
return type;
243251
}
@@ -691,17 +699,6 @@ public String toString() {
691699
}
692700
}
693701

694-
private Expression jsonInputExpression;
695-
private Expression jsonPathExpression;
696-
private String pathName;
697-
private final List<JsonTablePassingClause> passingClauses = new ArrayList<>();
698-
private JsonTableColumnsClause columnsClause;
699-
private JsonTablePlanClause planClause;
700-
private JsonTableOnErrorClause onErrorClause;
701-
private JsonTableParsingTypeClause parsingTypeClause;
702-
private JsonTableOnEmptyClause onEmptyClause;
703-
private boolean formatJson;
704-
705702
public JsonTableFunction() {
706703
setName("JSON_TABLE");
707704
}

src/test/java/net/sf/jsqlparser/expression/JsonTableOracleTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ void testExistsColumns(String jsonTableStr) throws JSQLParserException {
7373
"JSON_TABLE(document COLUMNS( val FORMAT JSON PATH '$.pathTest'))",
7474
"JSON_TABLE(document COLUMNS( val ALLOW SCALARS PATH '$.pathTest'))",
7575
"JSON_TABLE(document COLUMNS( val DISALLOW SCALARS PATH '$.pathTest'))",
76+
"JSON_TABLE(document COLUMNS( val VARCHAR(240) ALLOW SCALARS PATH '$.pathTest'))",
77+
"JSON_TABLE(document COLUMNS( val INT DISALLOW SCALARS PATH '$.pathTest'))",
7678
"JSON_TABLE(document COLUMNS( val FORMAT JSON DISALLOW SCALARS PATH '$.pathTest'))",
7779
"JSON_TABLE(document COLUMNS( val WITH WRAPPER PATH '$.pathTest'))",
7880
"JSON_TABLE(document COLUMNS( val WITHOUT WRAPPER PATH '$.pathTest'))",

0 commit comments

Comments
 (0)