From 8a006f67d53ae152270676c3cbee25ea4f77e6cd Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Wed, 26 Feb 2020 15:21:30 +0100 Subject: [PATCH] [jOOQ/jOOQ#9882] Deprecate SQLDialect#supports(Collection) --- jOOQ/src/main/java/org/jooq/SQLDialect.java | 3 +++ jOOQ/src/main/java/org/jooq/impl/Function.java | 2 +- jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index 4faa388e97..1f24b78f50 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -881,7 +881,10 @@ public enum SQLDialect { /** * Check whether this dialect supports any dialect from the argument * collection. + * + * @deprecated - [#9882] - 3.14.0 - Use {@link #supportedBy(SQLDialect...)} instead */ + @Deprecated public final boolean supports(Collection other) { if (other.contains(family)) return true; diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index e2ba870426..08686f7a63 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -508,7 +508,7 @@ class Function extends AbstractField implements // [#531] Inline window specifications if the WINDOW clause is not supported if (windowName != null) { - if (ctx.dialect().supports(SUPPORT_WINDOW_CLAUSE)) + if (SUPPORT_WINDOW_CLAUSE.contains(ctx.dialect())) return windowName; QueryPartList windows = (QueryPartList) ctx.data(DATA_WINDOW_DEFINITIONS); diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java index 2d25ffcd71..aadfd62600 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java @@ -1504,7 +1504,7 @@ final class SelectQueryImpl extends AbstractResultQuery imp // ------------- context.start(SELECT_WINDOW); - if (Tools.isNotEmpty(window) && context.dialect().supports(SUPPORT_WINDOW_CLAUSE)) { + if (Tools.isNotEmpty(window) && SUPPORT_WINDOW_CLAUSE.contains(context.dialect())) { context.formatSeparator() .visit(K_WINDOW) .sql(' ') diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java index de89c1d423..5ef5601e19 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java @@ -92,7 +92,7 @@ final class WindowDefinitionImpl extends AbstractQueryPart implements WindowDefi // Outside the WINDOW clause, only few dialects actually support // referencing WINDOW definitions - else if (ctx.dialect().supports(SUPPORT_WINDOW_CLAUSE)) { + else if (SUPPORT_WINDOW_CLAUSE.contains(ctx.dialect())) { ctx.visit(name); }