From 7e11993b3333ef6e48dda5d115447a7230c98302 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 5 Mar 2021 10:06:00 +0100 Subject: [PATCH] [jOOQ/jOOQ#11572] Add versioned dialects for COCKROACHDB 20, 21 --- jOOQ/src/main/java/org/jooq/SQLDialect.java | 18 ++++++++++++++++++ .../jooq/impl/AbstractAggregateFunction.java | 1 + jOOQ/src/main/java/org/jooq/impl/Limit.java | 2 ++ jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java | 2 +- .../src/main/java/org/jooq/impl/RegrCount.java | 2 +- .../main/java/org/jooq/impl/RegrIntercept.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RegrR2.java | 2 +- .../src/main/java/org/jooq/impl/RegrSlope.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RegrSxx.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RegrSxy.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RegrSyy.java | 2 +- .../java/org/jooq/impl/SelectQueryImpl.java | 2 ++ 13 files changed, 32 insertions(+), 9 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index d6a9f8c7f3..b29d8daf19 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -718,6 +718,24 @@ public enum SQLDialect { + + + + + + + + + + + + + + + + + + diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java index 6d2243e891..d6d9bd2361 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractAggregateFunction.java @@ -323,6 +323,7 @@ implements */ final DataType d(Context ctx) { switch (ctx.family()) { + case HSQLDB: case SQLITE: return DOUBLE; default: diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java index c853f20d6b..e2d652c140 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Limit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java @@ -315,6 +315,8 @@ final class Limit extends AbstractQueryPart { + + case HSQLDB: // No break diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java index b85919a25f..bd08206495 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java index 59ae4eda84..712152beb6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java index 772419949a..608ea24e1b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @Override public void accept(Context ctx) { diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java index 10b1e74788..84ac3ca603 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java index 990d3e5900..4ac9813e06 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java index da0af181ad..82e72af5c6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java index 1320eb3bbe..d401aec6d1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java index 107db4ae50..44c40b54fb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java index 5cec8d9468..cd0c9da556 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java +++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java @@ -87,7 +87,7 @@ extends - private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedBy(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); + private static final Set NO_SUPPORT_NATIVE = SQLDialect.supportedUntil(CUBRID, DERBY, FIREBIRD, H2, HSQLDB, IGNITE, MARIADB, MYSQL, SQLITE); @SuppressWarnings("unchecked") @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 151f554aa1..96469efe1a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -1490,6 +1490,8 @@ final class SelectQueryImpl extends AbstractResultQuery imp + +