Skip to content

Complete traversal of structured DDL children #2738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
minleejae wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Complete traversal of structured DDL children #2738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fe759a
fix: complete traversal of structured DDL children
minleejae Oct 1, 2026
7f8bb7f
test: cover VALUES child traversal with context
minleejae Oct 1, 2026
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
Next Next commit
fix: complete traversal of structured DDL children 
Signed-off-by: minleejae <mmj9808@gmail.com>
  • Loading branch information
@minleejae
minleejae committed Oct 1, 2026
commit 5fe759a5924e469aa1c5105f42bec3786a278e99
77 changes: 77 additions & 0 deletions src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@
*/
package net.sf.jsqlparser.statement;

import net.sf.jsqlparser.statement.alter.AlterRelation;
import net.sf.jsqlparser.statement.alter.AlterPolicy;
import net.sf.jsqlparser.statement.drop.DropPolicy;
import net.sf.jsqlparser.statement.create.statistics.CreateStatistics;
import net.sf.jsqlparser.statement.create.fdw.CreateForeignDataWrapper;
import net.sf.jsqlparser.statement.alter.AlterForeignDataWrapper;
import net.sf.jsqlparser.statement.create.server.CreateServer;
import net.sf.jsqlparser.statement.alter.AlterServer;
import net.sf.jsqlparser.statement.create.usermapping.CreateUserMapping;
import net.sf.jsqlparser.statement.alter.AlterUserMapping;
import net.sf.jsqlparser.statement.create.rule.CreateRule;
import net.sf.jsqlparser.statement.create.collation.CreateCollation;

import net.sf.jsqlparser.statement.create.accessmethod.CreateAccessMethod;

import net.sf.jsqlparser.statement.oracle.OracleBlock;
Expand Down Expand Up @@ -1159,4 +1172,68 @@ public <S> Void visit(OracleNullStatement statement, S context) {
public <S> Void visit(CreateAccessMethod statement, S context) {
return schemaOnly();
}

// These statements store definitions; visiting their children must not make a stored
// rule action or policy predicate appear to execute during the DDL statement itself.

@Override
public <S> Void visit(AlterRelation statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(AlterPolicy statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(DropPolicy statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateStatistics statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateForeignDataWrapper statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(AlterForeignDataWrapper statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateServer statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(AlterServer statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateUserMapping statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(AlterUserMapping statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateRule statement, S context) {
return schemaOnly();
}

@Override
public <S> Void visit(CreateCollation statement, S context) {
return schemaOnly();
}

}
108 changes: 107 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@
*/
package net.sf.jsqlparser.statement;

import net.sf.jsqlparser.statement.alter.AlterRelation;
import net.sf.jsqlparser.statement.alter.AlterPolicy;
import net.sf.jsqlparser.statement.drop.DropPolicy;
import net.sf.jsqlparser.statement.create.statistics.CreateStatistics;
import net.sf.jsqlparser.statement.create.fdw.CreateForeignDataWrapper;
import net.sf.jsqlparser.statement.alter.AlterForeignDataWrapper;
import net.sf.jsqlparser.statement.create.server.CreateServer;
import net.sf.jsqlparser.statement.alter.AlterServer;
import net.sf.jsqlparser.statement.create.usermapping.CreateUserMapping;
import net.sf.jsqlparser.statement.alter.AlterUserMapping;
import net.sf.jsqlparser.statement.create.rule.CreateRule;
import net.sf.jsqlparser.statement.create.collation.CreateCollation;
import net.sf.jsqlparser.statement.notify.NotifyStatement;
import net.sf.jsqlparser.statement.foreign.ForeignDataStatement;

import net.sf.jsqlparser.statement.create.accessmethod.CreateAccessMethod;

import net.sf.jsqlparser.statement.oracle.OracleBlock;
Expand Down Expand Up @@ -305,7 +320,7 @@ public <S> T visit(Insert insert, S context) {
selectVisitor.visitOutputClause(insert.getOutputClause(), context);

if (insert.getSelect() != null) {
insert.getSelect().accept(selectVisitor, null);
insert.getSelect().accept(selectVisitor, context);
}

expressionVisitor.visitUpdateSets(insert.getSetUpdateSets(), context);
Expand Down Expand Up @@ -904,4 +919,95 @@ public <S> T visit(OracleAssignment assignment, S context) {
public <S> T visit(CreateAccessMethod statement, S context) {
return null;
}

@Override
public <S> T visit(AlterRelation statement, S context) {
if (statement.getObjectType() != AlterRelation.ObjectType.INDEX) {
fromItemVisitor.visitFromItem(statement.getRelation(), context);
}
statement.getActions().forEach(action -> {
action.visitExpressions(expression -> expression.accept(expressionVisitor, context));
action.visitTables(table -> table.accept(fromItemVisitor, context));
});
return null;
}

@Override
public <S> T visit(AlterPolicy statement, S context) {
fromItemVisitor.visitFromItem(statement.getTable(), context);
if (statement.getNewName() == null) {
statement.getOptions()
.visitExpressions(expression -> expression.accept(expressionVisitor, context));
}
return null;
}

@Override
public <S> T visit(DropPolicy statement, S context) {
fromItemVisitor.visitFromItem(statement.getTable(), context);
return null;
}

@Override
public <S> T visit(CreateStatistics statement, S context) {
fromItemVisitor.visitFromItem(statement.getTable(), context);
expressionVisitor.visitExpression(statement.getExpressions(), context);
return null;
}

private <S> T visitForeignDataStatement(ForeignDataStatement statement, S context) {
statement.visitExpressions(expression -> expression.accept(expressionVisitor, context));
return null;
}

@Override
public <S> T visit(CreateForeignDataWrapper statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(AlterForeignDataWrapper statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(CreateServer statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(AlterServer statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(CreateUserMapping statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(AlterUserMapping statement, S context) {
return visitForeignDataStatement(statement, context);
}

@Override
public <S> T visit(CreateRule statement, S context) {
statement.visitTables(table -> table.accept(fromItemVisitor, context));
statement.visitExpressions(expression -> expression.accept(expressionVisitor, context));
statement.getActions().forEach(action -> action.accept(this, context));
return null;
}

@Override
public <S> T visit(NotifyStatement statement, S context) {
statement.visitExpressions(expression -> expression.accept(expressionVisitor, context));
return null;
}

@Override
public <S> T visit(CreateCollation statement, S context) {
statement.visitExpressions(expression -> expression.accept(expressionVisitor, context));
return null;
}

}
12 changes: 11 additions & 1 deletion src/main/java/net/sf/jsqlparser/statement/select/SelectVisitorAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,17 @@ public <S> T visit(WithItem<?> withItem, S context) {
}

@Override
public <S> T visit(Values aThis, S context) {
public <S> T visit(Values values, S context) {
visitWithItems(values.getWithItemsList(), context);
expressionVisitor.visitExpression(values.getExpressions(), context);
expressionVisitor.visitOrderBy(values.getOrderByElements(), context);
expressionVisitor.visitLimit(values.getLimit(), context);
if (values.getOffset() != null) {
expressionVisitor.visitExpression(values.getOffset().getOffset(), context);
}
if (values.getFetch() != null) {
expressionVisitor.visitExpression(values.getFetch().getExpression(), context);
}
return null;
}

Expand Down
43 changes: 43 additions & 0 deletions src/main/java/net/sf/jsqlparser/util/validation/validator/StatementValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
*/
package net.sf.jsqlparser.util.validation.validator;

import net.sf.jsqlparser.statement.alter.AlterRelation;
import net.sf.jsqlparser.statement.alter.AlterPolicy;
import net.sf.jsqlparser.statement.drop.DropPolicy;
import net.sf.jsqlparser.statement.create.statistics.CreateStatistics;

import net.sf.jsqlparser.statement.create.accessmethod.CreateAccessMethod;

import net.sf.jsqlparser.statement.create.fdw.CreateForeignDataWrapper;
Expand Down Expand Up @@ -1168,4 +1173,42 @@ public <S> Void visit(AlterCollation statement, S context) {
validateFeature(Feature.alterCollation);
return null;
}

@Override
public <S> Void visit(AlterRelation statement, S context) {
boolean index = statement.getObjectType() == AlterRelation.ObjectType.INDEX;
validateFeature(index ? Feature.alterIndex : Feature.alterView);
if (!index) {
validateOptionalFromItem(statement.getRelation());
}
statement.getActions().forEach(action -> {
action.visitExpressions(this::validateOptionalExpression);
action.visitTables(this::validateOptionalFromItem);
});
return null;
}

@Override
public <S> Void visit(AlterPolicy statement, S context) {
validateOptionalFromItem(statement.getTable());
if (statement.getNewName() == null) {
statement.getOptions().visitExpressions(this::validateOptionalExpression);
}
return null;
}

@Override
public <S> Void visit(DropPolicy statement, S context) {
validateFeature(Feature.drop);
validateOptionalFromItem(statement.getTable());
return null;
}

@Override
public <S> Void visit(CreateStatistics statement, S context) {
validateOptionalFromItem(statement.getTable());
validateOptionalExpression(statement.getExpressions());
return null;
}

}
Loading