[chore] Code Review

JSQLParser · manticore-projects · Apr 2, 2026 · Oct 13, 2025 · Oct 15, 2025 · Oct 17, 2025
commit 0c5526889e87fb22ac49ae17619c979460a7363c
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -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;
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -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) {

diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -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);

diff --git a/...sqlparser/expression/JsonOnEmptyType.java → ...rser/expression/json/JsonOnEmptyType.java b/...sqlparser/expression/JsonOnEmptyType.java → ...rser/expression/json/JsonOnEmptyType.java
@@ -23,7 +23,7 @@
  * 02110-1301 USA
  */
 
-package net.sf.jsqlparser.expression;
+package net.sf.jsqlparser.expression.json;
 
 /**
  *

diff --git a/...sqlparser/expression/JsonOnErrorType.java → ...rser/expression/json/JsonOnErrorType.java b/...sqlparser/expression/JsonOnErrorType.java → ...rser/expression/json/JsonOnErrorType.java
@@ -23,7 +23,7 @@
  * 02110-1301 USA
  */
 
-package net.sf.jsqlparser.expression;
+package net.sf.jsqlparser.expression.json;
 
 /**
  *

diff --git a/...rser/expression/JsonQueryWrapperType.java → ...expression/json/JsonQueryWrapperType.java b/...rser/expression/JsonQueryWrapperType.java → ...expression/json/JsonQueryWrapperType.java
@@ -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;
 

diff --git a/...qlparser/expression/JsonReturnClause.java → ...ser/expression/json/JsonReturnClause.java b/...qlparser/expression/JsonReturnClause.java → ...ser/expression/json/JsonReturnClause.java
@@ -1,4 +1,4 @@
-package net.sf.jsqlparser.expression;
+package net.sf.jsqlparser.expression.json;
 
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 

diff --git a/...jsqlparser/expression/JsonReturnType.java → ...arser/expression/json/JsonReturnType.java b/...jsqlparser/expression/JsonReturnType.java → ...arser/expression/json/JsonReturnType.java
@@ -23,7 +23,7 @@
  * 02110-1301 USA
  */
 
-package net.sf.jsqlparser.expression;
+package net.sf.jsqlparser.expression.json;
 
 /**
  *

diff --git a/...t/sf/jsqlparser/expression/JsonTable.java → .../jsqlparser/statement/from/JsonTable.java b/...t/sf/jsqlparser/expression/JsonTable.java → .../jsqlparser/statement/from/JsonTable.java
@@ -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;

diff --git a/...sqlparser/expression/JsonTableColumn.java → ...arser/statement/from/JsonTableColumn.java b/...sqlparser/expression/JsonTableColumn.java → ...arser/statement/from/JsonTableColumn.java
@@ -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 {

diff --git a/...arser/expression/JsonTableColumnType.java → ...r/statement/from/JsonTableColumnType.java b/...arser/expression/JsonTableColumnType.java → ...r/statement/from/JsonTableColumnType.java
@@ -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

diff --git a/.../jsqlparser/expression/JsonTableType.java → ...lparser/statement/from/JsonTableType.java b/.../jsqlparser/expression/JsonTableType.java → ...lparser/statement/from/JsonTableType.java
@@ -23,7 +23,7 @@
  * 02110-1301 USA
  */
 
-package net.sf.jsqlparser.expression;
+package net.sf.jsqlparser.statement.from;
 
 /**
  *

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java
@@ -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;
 

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java
@@ -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;
 
@@ -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);
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -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;
@@ -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).
      *
@@ -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

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -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 ");
@@ -1777,4 +1771,5 @@ public <S> StringBuilder visit(CosineSimilarity cosineSimilarity, S context) {
     public <S> StringBuilder visit(FromQuery fromQuery, S context) {
         return null;
     }
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -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;

diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java
@@ -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;
@@ -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);

diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java
@@ -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;

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -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.*;
@@ -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.*;

diff --git a/.../jsqlparser/expression/JsonTableTest.java → ...lparser/statement/from/JsonTableTest.java b/.../jsqlparser/expression/JsonTableTest.java → ...lparser/statement/from/JsonTableTest.java
@@ -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;

diff --git a/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java b/src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java
@@ -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");
+
+    }
+
 }
-Original file 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 @@