From 7a4b83a589ac70bef92b63b2195654bf3b08cf47 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 30 May 2024 11:07:51 +0200 Subject: [PATCH] [jOOQ/jOOQ#16734] Redundant policy related logic in UpdateQueryImpl --- .../main/java/org/jooq/impl/DeleteQueryImpl.java | 2 +- .../main/java/org/jooq/impl/UpdateQueryImpl.java | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java index 73fb56ab28..1c0e33c223 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java @@ -297,7 +297,7 @@ implements } if (where.hasWhere()) - d.addConditions(where); + d.addConditions(where.getWhere()); }, transformInlineDerivedTables0(ctx, t, where, false) ).accept0(ctx); diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index 43c4fa597c..276c89f145 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -595,7 +595,7 @@ implements } if (where.hasWhere()) - d.addConditionsForInlineDerivedTable(where); + d.addConditionsForInlineDerivedTable(where.getWhere()); }, transformInlineDerivedTables0(ctx, t, where, false) ).accept0(ctx); @@ -723,20 +723,9 @@ implements final void accept2(Context ctx) { boolean declareTables = ctx.declareTables(); - // [#14011] Additional predicates that are added for various reasons - Condition moreWhere = noCondition(); Table t = table(ctx); ctx.scopeRegister(t, true); - - - - - - - - - ConditionProviderImpl where0 = new ConditionProviderImpl(); TableList f = getFrom(ctx, where0); Table t0 = t;