Merge branch 'master' of github.com:JSQLParser/JSqlParser into manticore

Author: manticore-projects

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

@@ -652,6 +652,14 @@ default void visit(JsonFunction jsonFunction) {
         this.visit(jsonFunction, null);
     }
 
+    default <S> T visit(JsonTableFunction jsonTableFunction, S context) {
+        return visit((Function) jsonTableFunction, context);
+    }
+
+    default void visit(JsonTableFunction jsonTableFunction) {
+        this.visit(jsonTableFunction, null);
+    }
+
     <S> T visit(ConnectByRootOperator connectByRootOperator, S context);
 
     default void visit(ConnectByRootOperator connectByRootOperator) {

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

@@ -722,12 +722,40 @@ public <S> T visit(JsonAggregateFunction jsonAggregateFunction, S context) {
     @Override
     public <S> T visit(JsonFunction jsonFunction, S context) {
         ArrayList<Expression> subExpressions = new ArrayList<>();
+        for (JsonKeyValuePair keyValuePair : jsonFunction.getKeyValuePairs()) {
+            if (keyValuePair.getKey() instanceof Expression) {
+                subExpressions.add((Expression) keyValuePair.getKey());
+            }
+            if (keyValuePair.getValue() instanceof Expression) {
+                subExpressions.add((Expression) keyValuePair.getValue());
+            }
+        }
         for (JsonFunctionExpression expr : jsonFunction.getExpressions()) {
             subExpressions.add(expr.getExpression());
         }
+        if (jsonFunction.getInputExpression() != null) {
+            subExpressions.add(jsonFunction.getInputExpression().getExpression());
+        }
+        if (jsonFunction.getJsonPathExpression() != null) {
+            subExpressions.add(jsonFunction.getJsonPathExpression());
+        }
+        subExpressions.addAll(jsonFunction.getPassingExpressions());
+        if (jsonFunction.getOnEmptyBehavior() != null
+                && jsonFunction.getOnEmptyBehavior().getExpression() != null) {
+            subExpressions.add(jsonFunction.getOnEmptyBehavior().getExpression());
+        }
+        if (jsonFunction.getOnErrorBehavior() != null
+                && jsonFunction.getOnErrorBehavior().getExpression() != null) {
+            subExpressions.add(jsonFunction.getOnErrorBehavior().getExpression());
+        }
         return visitExpressions(jsonFunction, context, subExpressions);
     }
 
+    @Override
+    public <S> T visit(JsonTableFunction jsonTableFunction, S context) {
+        return visitExpressions(jsonTableFunction, context, jsonTableFunction.getAllExpressions());
+    }
+
     @Override
     public <S> T visit(ConnectByRootOperator connectByRootOperator, S context) {
         return connectByRootOperator.getColumn().accept(this, context);