github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#16633] Fix VisitListener regressions

Browse Source
This commit is contained in:
Lukas Eder 2024-05-03 18:13:53 +02:00
parent 3a63e58699
commit 5261674a3f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
View File

@ -451,7 +451,7 @@ implements
ctx.data(DATA_UNQUALIFY_LOCAL_SCOPE, true);
ctx.formatSeparator()
.visit(K_WHERE).sql(' ').visit(where0);
.visit(K_WHERE).sql(' ').visit(where0.getWhere());
if (noQualifyInWhere)
ctx.data(DATA_UNQUALIFY_LOCAL_SCOPE, false);

24
jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
View File

@ -748,9 +748,6 @@ implements
.declareTables(declareTables)
.end(UPDATE_UPDATE);
// [#16634] Prevent unnecessary FROM clause in some dialects, e.g. HANA
boolean hasFrom = !from.isEmpty() && !NO_SUPPORT_FROM.contains(ctx.dialect());
@ -773,8 +770,7 @@ implements
if (hasFrom)
acceptFrom(ctx);
acceptFrom(ctx);
ConditionProviderImpl where0 = new ConditionProviderImpl();
if (limitEmulation(ctx)) {
@ -807,7 +803,7 @@ implements
ctx.data(DATA_UNQUALIFY_LOCAL_SCOPE, true);
ctx.formatSeparator()
.visit(K_WHERE).sql(' ').visit(where0);
.visit(K_WHERE).sql(' ').visit(where0.getWhere());
if (noQualifyInWhere)
ctx.data(DATA_UNQUALIFY_LOCAL_SCOPE, false);
@ -844,7 +840,10 @@ implements
private final void acceptFrom(Context<?> ctx) {
ctx.start(UPDATE_FROM);
TableList f = new TableList();
// [#16634] Prevent unnecessary FROM clause in some dialects, e.g. HANA
if (!NO_SUPPORT_FROM.contains(ctx.dialect())) {
TableList f = new TableList();
@ -855,7 +854,7 @@ implements
f.addAll(from);
f.addAll(from);
@ -864,10 +863,11 @@ implements
if (!f.isEmpty())
ctx.formatSeparator()
.visit(K_FROM).sql(' ')
.declareTables(true, c -> c.visit(f));
if (!f.isEmpty())
ctx.formatSeparator()
.visit(K_FROM).sql(' ')
.declareTables(true, c -> c.visit(f));
}
ctx.end(UPDATE_FROM);
}