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

[jOOQ/jOOQ#16946] Apply fix also to OSS edition

Browse Source
This commit is contained in:
Lukas Eder 2024-08-05 15:03:31 +02:00
parent 90c3cd8e5c
commit 79d9acb567
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
View File

@ -3510,26 +3510,23 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
}
}
actualOrderBy = new QueryPartListView<>(actualOrderBy).map(t1 -> {
Field<?> out = getResolveProjection(ctx, t1.$field());
return t1.$field() == out ? t1 : t1.$field(out);
});
// [#2080] DB2, Oracle, and Sybase can deal with column aliases from the SELECT clause
// but in case the aliases have been overridden to emulate OFFSET pagination, the
// overrides must also apply to the ORDER BY clause
if (aliasOverride != null) {
QueryPart o = actualOrderBy;
{
ctx.qualify(
!wrapQueryExpressionBodyInDerivedTable && ctx.qualify(),
c1 -> c1.data(DATA_OVERRIDE_ALIASES_IN_ORDER_BY, aliasOverride, c2 -> c2.visit(o))
);
}
else {
if (NO_SUPPORT_UNION_ORDER_BY_ALIAS.contains(ctx.dialect()) && hasUnions() && isUnionOrderBy) {
List<String> n = map(getSelect(), Field::getName);