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

[jOOQ/jOOQ#9017] Combine several rownum filters and retain the lowest

Browse Source
This commit is contained in:
Lukas Eder 2020-09-24 10:11:07 +02:00
parent 87ab89ba7c
commit 4dbb40e58e
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jOOQ/src/main/java/org/jooq/impl/Limit.java
View File

@ -70,6 +70,7 @@ import org.jooq.RenderContext.CastMode;
import org.jooq.conf.ParamType;
import org.jooq.exception.DataAccessException;
import org.jooq.impl.Tools.BooleanDataKey;
import org.jooq.tools.Convert;
/**
* @author Lukas Eder
@ -80,15 +81,15 @@ final class Limit extends AbstractQueryPart {
* Generated UID
*/
private static final long serialVersionUID = 2053741242981425602L;
private static final Field<Integer> ZERO = zero();
private static final Field<Integer> ONE = one();
private static final Param<Integer> ZERO = zero();
private static final Param<Integer> ONE = one();
private static final Param<Integer> MAX = DSL.inline(Integer.MAX_VALUE);
Param<?> numberOfRows;
private Field<?> numberOfRowsOrMax = MAX;
private Param<?> numberOfRowsOrMax = MAX;
Param<?> offset;
private Field<?> offsetOrZero = ZERO;
private Field<?> offsetPlusOne = ONE;
private Param<?> offsetOrZero = ZERO;
private Param<?> offsetPlusOne = ONE;
private boolean rendersParams;
boolean withTies;
boolean percent;
@ -468,6 +469,10 @@ final class Limit extends AbstractQueryPart {
this.rendersParams |= numberOfRows.isInline();
}
final Long getNumberOfRows() {
return Convert.convert((numberOfRows != null ? numberOfRows : numberOfRowsOrMax).getValue(), long.class);
}
final void setPercent(boolean percent) {
this.percent = percent;
}
@ -485,8 +490,14 @@ final class Limit extends AbstractQueryPart {
}
final Limit from(Limit limit) {
// [#9017] Take the lower number of two LIMIT clauses, maintaining
// inline flags and parameter names
if (limit.numberOfRows != null)
this.setNumberOfRows(limit.numberOfRows);
if (numberOfRows == null)
this.setNumberOfRows(limit.numberOfRows);
else
this.setNumberOfRows(((Val<?>) limit.numberOfRows).copy(Math.min(getNumberOfRows(), limit.getNumberOfRows())));
if (limit.offset != null)
this.setOffset(limit.offset);

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

@ -378,7 +378,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
this.from.add(from.asTable());
}
SelectQueryImpl<R> copy() {
final SelectQueryImpl<R> copy() {
SelectQueryImpl<R> result = new SelectQueryImpl<>(configuration(), with);
result.condition.setWhere(condition.getWhere());