diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 4005a23f6e..ed467791b8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -54,7 +54,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -108,7 +107,7 @@ import org.jooq.tools.csv.CSVReader; public abstract class AbstractDatabase implements Database { private static final JooqLogger log = JooqLogger.getLogger(AbstractDatabase.class); - private static final EnumSet NO_SUPPORT_SCHEMATA = EnumSet.of(CUBRID, FIREBIRD, SQLITE); + private static final Set NO_SUPPORT_SCHEMATA = SQLDialect.supported(CUBRID, FIREBIRD, SQLITE); // ------------------------------------------------------------------------- // Configuration elements diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java index face0d15a9..891034cd3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractContext.java @@ -55,10 +55,10 @@ import java.sql.PreparedStatement; import java.util.ArrayDeque; import java.util.BitSet; import java.util.Deque; -import java.util.EnumSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import org.jooq.BindContext; import org.jooq.Clause; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 67bbc41abf..691d60d840 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -86,7 +86,6 @@ import java.time.OffsetTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.EnumSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java index 77dd79d7f0..01be9ab833 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java @@ -70,8 +70,8 @@ import static org.jooq.impl.Tools.DataKey.DATA_BLOCK_NESTING; import java.util.ArrayList; import java.util.Collection; -import java.util.EnumSet; import java.util.List; +import java.util.Set; import org.jooq.Block; import org.jooq.Configuration; @@ -94,8 +94,8 @@ final class BlockImpl extends AbstractRowCountQuery implements Block { * Generated UID */ private static final long serialVersionUID = 6881305779639901498L; - private static final EnumSet REQUIRES_EXECUTE_IMMEDIATE_ON_DDL = EnumSet.of(FIREBIRD); - private static final EnumSet SUPPORTS_NULL_STATEMENT = EnumSet.of(POSTGRES); + private static final Set REQUIRES_EXECUTE_IMMEDIATE_ON_DDL = SQLDialect.supported(FIREBIRD); + private static final Set SUPPORTS_NULL_STATEMENT = SQLDialect.supported(POSTGRES); diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index 2cb2825ff5..542fe9e4b8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -67,8 +67,8 @@ import static org.jooq.impl.Keywords.K_REPLACE; import static org.jooq.impl.Keywords.K_VIEW; import static org.jooq.impl.Tools.EMPTY_FIELD; -import java.util.EnumSet; import java.util.List; +import java.util.Set; import java.util.function.BiFunction; import org.jooq.Clause; @@ -102,7 +102,7 @@ final class CreateViewImpl extends AbstractRowCountQuery imple */ private static final long serialVersionUID = 8904572826501186329L; private static final Clause[] CLAUSES = { CREATE_VIEW }; - private static final EnumSet NO_SUPPORT_IF_NOT_EXISTS = EnumSet.of(DERBY, FIREBIRD, POSTGRES); + private static final Set NO_SUPPORT_IF_NOT_EXISTS = SQLDialect.supported(DERBY, FIREBIRD, POSTGRES); private final boolean ifNotExists; private final boolean orReplace; diff --git a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java index 2e04f137c4..2719a5ea01 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java @@ -61,8 +61,8 @@ import static org.jooq.impl.DSL.trueCondition; import static org.jooq.impl.InCondition.padded; import java.util.ArrayList; -import java.util.EnumSet; import java.util.List; +import java.util.Set; import org.jooq.Clause; import org.jooq.Comparator; @@ -85,8 +85,9 @@ final class RowInCondition extends AbstractCondition { private static final Clause[] CLAUSES_IN = { CONDITION, CONDITION_IN }; private static final Clause[] CLAUSES_IN_NOT = { CONDITION, CONDITION_NOT_IN }; - // Currently not yet supported in SQLite: https://www.sqlite.org/rowvalue.html - private static final EnumSet EMULATE_IN = EnumSet.of(DERBY, FIREBIRD, SQLITE); + // Currently not yet supported in SQLite: + // https://www.sqlite.org/rowvalue.html + private static final Set EMULATE_IN = SQLDialect.supported(DERBY, FIREBIRD, SQLITE); private final Row left; private final QueryPartList right; diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java index c6e311f76d..30b393d2ca 100644 --- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java @@ -51,7 +51,7 @@ import static org.jooq.impl.Keywords.K_WITH; import java.util.Arrays; import java.util.Collection; -import java.util.EnumSet; +import java.util.Set; import java.util.function.BiFunction; import java.util.function.Function;