From 33b96c3a964f29866a50e77bea93ed179cbb25fc Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 27 Oct 2021 11:02:41 +0200 Subject: [PATCH] [jOOQ/jOOQ#12561] Refactor ROWNUM transformation to use QOM::replace --- .../java/org/jooq/impl/SelectQueryImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 83b3339d17..32481a0aaa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -108,6 +108,8 @@ import static org.jooq.SQLDialect.SQLITE; // ... import static org.jooq.SQLDialect.YUGABYTE; import static org.jooq.SortOrder.DESC; +import static org.jooq.Traversers.containing; +import static org.jooq.Traversers.findingAny; import static org.jooq.conf.ParamType.INLINED; import static org.jooq.impl.AsteriskImpl.NO_SUPPORT_UNQUALIFIED_COMBINED; import static org.jooq.impl.AsteriskImpl.SUPPORT_NATIVE_EXCEPT; @@ -233,11 +235,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.function.BiFunction; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -import org.jooq.Asterisk; import org.jooq.Clause; import org.jooq.Comparator; import org.jooq.Condition; @@ -280,8 +280,10 @@ import org.jooq.TableOnStep; import org.jooq.TableOptionalOnStep; import org.jooq.TablePartitionByStep; import org.jooq.Traverser; +import org.jooq.Traversers; // ... import org.jooq.WindowDefinition; +import org.jooq.WindowFinalStep; import org.jooq.XML; import org.jooq.exception.DataAccessException; import org.jooq.impl.ForLock.ForLockMode; @@ -295,8 +297,6 @@ import org.jooq.impl.Tools.DataKey; import org.jooq.tools.JooqLogger; import org.jooq.tools.StringUtils; -import org.jetbrains.annotations.NotNull; - /** * A sub-select is a SELECT statement that can be combined with @@ -3771,6 +3771,15 @@ final class SelectQueryImpl extends AbstractResultQuery imp + + + + + + + + +