From 19c276b118dcff31ecaa3785b21f4593ca4a4f78 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 26 Nov 2020 19:38:33 +0100 Subject: [PATCH] [jOOQ/jOOQ#11021] Fix MariaDB --- .../java/org/jooq/impl/AbstractWindowFunction.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java index b3a53817c6..b7047b33ce 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java @@ -46,6 +46,7 @@ import static java.lang.Boolean.TRUE; import static org.jooq.SQLDialect.H2; // ... // ... +import static org.jooq.SQLDialect.MARIADB; import static org.jooq.SQLDialect.MYSQL; // ... import static org.jooq.SQLDialect.POSTGRES; @@ -106,11 +107,10 @@ implements private static final long serialVersionUID = 2524547974085497171L; private static final Set SUPPORT_NO_PARENS_WINDOW_REFERENCE = SQLDialect.supportedBy(MYSQL, POSTGRES, SQLITE); - private static final Set REQUIRES_ORDER_BY_IN_LEAD_LAG = SQLDialect.supportedBy(H2); + private static final Set REQUIRES_ORDER_BY_IN_LEAD_LAG = SQLDialect.supportedBy(H2, MARIADB); private static final Set REQUIRES_ORDER_BY_IN_NTILE = SQLDialect.supportedBy(H2); - private static final Set REQUIRES_ORDER_BY_IN_RANK_DENSE_RANK = SQLDialect.supportedBy(H2); - - + private static final Set REQUIRES_ORDER_BY_IN_RANK_DENSE_RANK = SQLDialect.supportedBy(H2, MARIADB); + private static final Set REQUIRES_ORDER_BY_IN_PERCENT_RANK_CUME_DIST = SQLDialect.supportedBy(MARIADB); @@ -182,7 +182,7 @@ implements this instanceof Ntile && REQUIRES_ORDER_BY_IN_NTILE.contains(ctx.dialect()) || this instanceof PositionalWindowFunction && ((PositionalWindowFunction) this).isLeadOrLag() && REQUIRES_ORDER_BY_IN_LEAD_LAG.contains(ctx.dialect()) || this instanceof RankingFunction && ((RankingFunction) this).isRankOrDenseRank() && REQUIRES_ORDER_BY_IN_RANK_DENSE_RANK.contains(ctx.dialect()) - + || this instanceof RankingFunction && !((RankingFunction) this).isRankOrDenseRank() && REQUIRES_ORDER_BY_IN_PERCENT_RANK_CUME_DIST.contains(ctx.dialect())