From 003290cbe157f2bc8d8fc79b3c503ad55da5028f Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Wed, 2 Oct 2019 15:02:16 +0200 Subject: [PATCH] [jOOQ/jOOQ#9312] Use SQLDialect.supported() in AbstractResultQuery --- .../main/java/org/jooq/impl/AbstractResultQuery.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index 3c515de157..8eb7556c05 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -39,7 +39,6 @@ package org.jooq.impl; import static java.sql.ResultSet.CONCUR_UPDATABLE; import static java.sql.ResultSet.TYPE_SCROLL_SENSITIVE; -import static java.util.Arrays.asList; import static java.util.concurrent.Executors.newSingleThreadExecutor; // ... import static org.jooq.SQLDialect.CUBRID; @@ -128,9 +127,11 @@ abstract class AbstractResultQuery extends AbstractQuery imple /** * Generated UID */ - private static final long serialVersionUID = -5588344253566055707L; - private static final JooqLogger log = JooqLogger.getLogger(AbstractResultQuery.class); - private static final Set NO_SUPPORT_FOR_UPDATE = SQLDialect.supported(CUBRID); + private static final long serialVersionUID = -5588344253566055707L; + private static final JooqLogger log = JooqLogger.getLogger(AbstractResultQuery.class); + + private static final Set NO_SUPPORT_FOR_UPDATE = SQLDialect.supported(CUBRID); + private static final Set REPORT_FETCH_SIZE_WITH_AUTOCOMMIT = SQLDialect.supported(POSTGRES); private int maxRows; private int fetchSize; @@ -287,7 +288,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple // [#4511] [#4753] PostgreSQL doesn't like fetchSize with autoCommit == true int f = SettingsTools.getFetchSize(fetchSize, ctx.settings()); - if (asList(POSTGRES).contains(ctx.family()) && f != 0 && ctx.connection().getAutoCommit()) + if (REPORT_FETCH_SIZE_WITH_AUTOCOMMIT.contains(ctx.dialect()) && f != 0 && ctx.connection().getAutoCommit()) log.info("Fetch Size", "A fetch size of " + f + " was set on a auto-commit PostgreSQL connection, which is not recommended. See http://jdbc.postgresql.org/documentation/head/query.html#query-with-cursor"); SQLException e = executeStatementAndGetFirstResultSet(ctx, rendered.skipUpdateCounts);