Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[chore] Code Review
  • Loading branch information
ANeumann82 committed Oct 17, 2025
commit 0c5526889e87fb22ac49ae17619c979460a7363c
2 changes: 2 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,6 @@
exports net.sf.jsqlparser.util.validation.feature;
exports net.sf.jsqlparser.util.validation.metadata;
exports net.sf.jsqlparser.util.validation.validator;
exports net.sf.jsqlparser.expression.json;
exports net.sf.jsqlparser.statement.from;
}
Original file line number Diff line number Diff line change
Expand Up @@ -652,12 +652,6 @@ default void visit(JsonFunction jsonFunction) {
this.visit(jsonFunction, null);
}

<S> T visit(JsonTable jsonTable, S context);

default void visit(JsonTable jsonTable) {
this.visit(jsonTable, null);
}

<S> T visit(ConnectByRootOperator connectByRootOperator, S context);

default void visit(ConnectByRootOperator connectByRootOperator) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -728,12 +728,6 @@ public <S> T visit(JsonFunction jsonFunction, S context) {
return visitExpressions(jsonFunction, context, subExpressions);
}

@Override
public <S> T visit(JsonTable jsonTable, S context) {
// TODO: Implement
return null;
}

@Override
public <S> T visit(ConnectByRootOperator connectByRootOperator, S context) {
return connectByRootOperator.getColumn().accept(this, context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* 02110-1301 USA
*/

package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.expression.json;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* 02110-1301 USA
*/

package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.expression.json;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,22 @@
* 02110-1301 USA
*/

package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.expression.json;

/**
*
*/
public enum JsonQueryWrapperType {
WITHOUT_WRAPPER("WITHOUT WRAPPER"), WITHOUT_ARRAY_WRAPPER(
"WITHOUT ARRAY WRAPPER"), WITH_WRAPPER("WITH WRAPPER"), WITH_ARRAY_WRAPPER(
"WITH ARRAY WRAPPER"), WITH_UNCONDITIONAL_WRAPPER(
"WITH UNCONDITIONAL WRAPPER"), WITH_UNCONDITIONAL_ARRAY_WRAPPER(
"WITH UNCONDITIONAL ARRAY WRAPPER"), WITH_CONDITIONAL_WRAPPER(
"WITH CONDITIONAL WRAPPER"), WITH_CONDITIONAL_ARRAY_WRAPPER(
"WITH CONDITIONAL ARRAY WRAPPER");
//@formatter:off
WITHOUT_WRAPPER("WITHOUT WRAPPER"),
WITHOUT_ARRAY_WRAPPER("WITHOUT ARRAY WRAPPER"),
WITH_WRAPPER("WITH WRAPPER"),
WITH_ARRAY_WRAPPER("WITH ARRAY WRAPPER"),
WITH_UNCONDITIONAL_WRAPPER("WITH UNCONDITIONAL WRAPPER"),
WITH_UNCONDITIONAL_ARRAY_WRAPPER("WITH UNCONDITIONAL ARRAY WRAPPER"),
WITH_CONDITIONAL_WRAPPER("WITH CONDITIONAL WRAPPER"),
WITH_CONDITIONAL_ARRAY_WRAPPER("WITH CONDITIONAL ARRAY WRAPPER");
//@formatter:on

private final String value;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.expression.json;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* 02110-1301 USA
*/

package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.expression.json;

/**
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.statement.from;

import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.json.JsonOnEmptyType;
import net.sf.jsqlparser.expression.json.JsonOnErrorType;
import net.sf.jsqlparser.statement.select.AbstractFromitem;
import net.sf.jsqlparser.statement.select.FromItem;
import net.sf.jsqlparser.statement.select.FromItemVisitor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.statement.from;

import net.sf.jsqlparser.expression.json.JsonOnEmptyType;
import net.sf.jsqlparser.expression.json.JsonOnErrorType;
import net.sf.jsqlparser.expression.json.JsonQueryWrapperType;
import net.sf.jsqlparser.expression.json.JsonReturnClause;
import net.sf.jsqlparser.parser.ASTNodeAccessImpl;

public class JsonTableColumn extends ASTNodeAccessImpl {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.statement.from;

public enum JsonTableColumnType {
JSON_EXISTS, JSON_QUERY, JSON_VALUE, JSON_NESTED_PATH, ORDINALITY
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* 02110-1301 USA
*/

package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.statement.from;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
*/
package net.sf.jsqlparser.statement.select;

import net.sf.jsqlparser.expression.JsonTable;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.from.JsonTable;
import net.sf.jsqlparser.statement.imprt.Import;
import net.sf.jsqlparser.statement.piped.FromQuery;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;
import net.sf.jsqlparser.expression.ExpressionVisitorAdapter;
import net.sf.jsqlparser.expression.JsonTable;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.from.JsonTable;
import net.sf.jsqlparser.statement.imprt.Import;
import net.sf.jsqlparser.statement.piped.FromQuery;

Expand Down Expand Up @@ -152,7 +152,6 @@ public <S> T visit(FromQuery fromQuery, S context) {

@Override
public <S> T visit(JsonTable jsonTable, S context) {
// TODO: Implement
return null;
return jsonTable.getExpression().accept(expressionVisitor, context);
}
}
10 changes: 2 additions & 8 deletions src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
import net.sf.jsqlparser.statement.select.FromItemVisitor;
import net.sf.jsqlparser.statement.select.FunctionAllColumns;
import net.sf.jsqlparser.statement.select.Join;
import net.sf.jsqlparser.statement.from.JsonTable;
import net.sf.jsqlparser.statement.select.LateralSubSelect;
import net.sf.jsqlparser.statement.select.OrderByElement;
import net.sf.jsqlparser.statement.select.ParenthesedFromItem;
Expand Down Expand Up @@ -335,12 +336,6 @@ public void visit(PlainSelect plainSelect) {
SelectVisitor.super.visit(plainSelect);
}

@Override
public void visit(JsonTable jsonTable) {
FromItemVisitor.super.visit(jsonTable);
// TODO: Implement
}

/**
* Override to adapt the tableName generation (e.g. with / without schema).
*
Expand Down Expand Up @@ -1729,8 +1724,7 @@ public <S> Void visit(JsonFunction expression, S context) {

@Override
public <S> Void visit(JsonTable jsonTable, S context) {
// TODO: Implement
return null;
return jsonTable.getExpression().accept(this, context);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1570,12 +1570,6 @@ public <S> StringBuilder visit(JsonFunction expression, S context) {
return builder;
}

@Override
public <S> StringBuilder visit(JsonTable expression, S context) {
expression.append(builder);
return builder;
}

@Override
public <S> StringBuilder visit(ConnectByRootOperator connectByRootOperator, S context) {
builder.append("CONNECT_BY_ROOT ");
Expand Down Expand Up @@ -1777,4 +1771,5 @@ public <S> StringBuilder visit(CosineSimilarity cosineSimilarity, S context) {
public <S> StringBuilder visit(FromQuery fromQuery, S context) {
return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@
*/
package net.sf.jsqlparser.util.deparser;

import net.sf.jsqlparser.expression.*;
import net.sf.jsqlparser.expression.Alias;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;
import net.sf.jsqlparser.statement.from.JsonTable;
import net.sf.jsqlparser.expression.MySQLIndexHint;
import net.sf.jsqlparser.expression.OracleHint;
import net.sf.jsqlparser.expression.SQLServerHints;
import net.sf.jsqlparser.expression.WindowDefinition;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.imprt.Import;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,66 @@
*/
package net.sf.jsqlparser.util.validation.validator;

import net.sf.jsqlparser.expression.*;
import net.sf.jsqlparser.expression.AllValue;
import net.sf.jsqlparser.expression.AnalyticExpression;
import net.sf.jsqlparser.expression.AnyComparisonExpression;
import net.sf.jsqlparser.expression.ArrayConstructor;
import net.sf.jsqlparser.expression.ArrayExpression;
import net.sf.jsqlparser.expression.BinaryExpression;
import net.sf.jsqlparser.expression.BooleanValue;
import net.sf.jsqlparser.expression.CaseExpression;
import net.sf.jsqlparser.expression.CastExpression;
import net.sf.jsqlparser.expression.CollateExpression;
import net.sf.jsqlparser.expression.ConnectByPriorOperator;
import net.sf.jsqlparser.expression.ConnectByRootOperator;
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
import net.sf.jsqlparser.expression.DateValue;
import net.sf.jsqlparser.expression.DoubleValue;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.ExpressionVisitor;
import net.sf.jsqlparser.expression.ExtractExpression;
import net.sf.jsqlparser.expression.Function;
import net.sf.jsqlparser.expression.HexValue;
import net.sf.jsqlparser.expression.HighExpression;
import net.sf.jsqlparser.expression.IntervalExpression;
import net.sf.jsqlparser.expression.Inverse;
import net.sf.jsqlparser.expression.JdbcNamedParameter;
import net.sf.jsqlparser.expression.JdbcParameter;
import net.sf.jsqlparser.expression.JsonAggregateFunction;
import net.sf.jsqlparser.expression.JsonExpression;
import net.sf.jsqlparser.expression.JsonFunction;
import net.sf.jsqlparser.expression.KeepExpression;
import net.sf.jsqlparser.expression.LambdaExpression;
import net.sf.jsqlparser.expression.LongValue;
import net.sf.jsqlparser.expression.LowExpression;
import net.sf.jsqlparser.expression.MySQLGroupConcat;
import net.sf.jsqlparser.expression.NextValExpression;
import net.sf.jsqlparser.expression.NotExpression;
import net.sf.jsqlparser.expression.NullValue;
import net.sf.jsqlparser.expression.NumericBind;
import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
import net.sf.jsqlparser.expression.OracleHint;
import net.sf.jsqlparser.expression.OracleNamedFunctionParameter;
import net.sf.jsqlparser.expression.OverlapsCondition;
import net.sf.jsqlparser.expression.RangeExpression;
import net.sf.jsqlparser.expression.RowConstructor;
import net.sf.jsqlparser.expression.RowGetExpression;
import net.sf.jsqlparser.expression.SignedExpression;
import net.sf.jsqlparser.expression.StringValue;
import net.sf.jsqlparser.expression.StructType;
import net.sf.jsqlparser.expression.TimeKeyExpression;
import net.sf.jsqlparser.expression.TimeValue;
import net.sf.jsqlparser.expression.TimestampValue;
import net.sf.jsqlparser.expression.TimezoneExpression;
import net.sf.jsqlparser.expression.TranscodingFunction;
import net.sf.jsqlparser.expression.TrimFunction;
import net.sf.jsqlparser.expression.UserVariable;
import net.sf.jsqlparser.expression.VariableAssignment;
import net.sf.jsqlparser.expression.WhenClause;
import net.sf.jsqlparser.expression.WindowElement;
import net.sf.jsqlparser.expression.WindowOffset;
import net.sf.jsqlparser.expression.WindowRange;
import net.sf.jsqlparser.expression.XMLSerializeExpr;
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseLeftShift;
Expand Down Expand Up @@ -974,12 +1033,6 @@ public <S> Void visit(JsonFunction expression, S context) {
return null;
}

@Override
public <S> Void visit(JsonTable jsonTable, S context) {
// TODO: Implement
return null;
}

@Override
public <S> Void visit(ConnectByRootOperator connectByRootOperator, S context) {
connectByRootOperator.getColumn().accept(this, context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.List;

import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.JsonTable;
import net.sf.jsqlparser.statement.from.JsonTable;
import net.sf.jsqlparser.expression.MySQLIndexHint;
import net.sf.jsqlparser.expression.SQLServerHints;
import net.sf.jsqlparser.parser.feature.Feature;
Expand Down
2 changes: 2 additions & 0 deletions src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import java.lang.Integer;

import net.sf.jsqlparser.parser.feature.*;
import net.sf.jsqlparser.expression.*;
import net.sf.jsqlparser.expression.json.*;
import net.sf.jsqlparser.expression.operators.arithmetic.*;
import net.sf.jsqlparser.expression.operators.conditional.*;
import net.sf.jsqlparser.expression.operators.relational.*;
Expand All @@ -58,6 +59,7 @@ import net.sf.jsqlparser.statement.create.table.*;
import net.sf.jsqlparser.statement.create.view.*;
import net.sf.jsqlparser.statement.delete.*;
import net.sf.jsqlparser.statement.drop.*;
import net.sf.jsqlparser.statement.from.*;
import net.sf.jsqlparser.statement.insert.*;
import net.sf.jsqlparser.statement.execute.*;
import net.sf.jsqlparser.statement.piped.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package net.sf.jsqlparser.expression;
package net.sf.jsqlparser.statement.from;

import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.json.JsonOnEmptyType;
import net.sf.jsqlparser.expression.json.JsonOnErrorType;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.statement.Statement;
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -733,5 +733,17 @@ void testNestedTablesInJsonObject() throws JSQLParserException {
assertThat(TablesNamesFinder.findTables(sqlStr)).containsExactlyInAnyOrder("table1",
"table2", "table3");
}

@Test
void testJsonTable() throws JSQLParserException {
String sqlStr = "SELECT * FROM JSON_TABLE(" +
"(SELECT json_column FROM table_with_json), '$.jsonPath' COLUMNS( id FOR ORDINALITY ))";

Set<String> tables = TablesNamesFinder.findTables(sqlStr);

assertThat(tables).containsExactly("table_with_json");

}

}

Loading