From e1b64b49879ff14528f08257c357f261505d8de3 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 28 May 2019 11:30:59 +0200 Subject: [PATCH 1/2] [#8694] Floor must switch over Configuration#family() --- jOOQ/src/main/java/org/jooq/impl/Floor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java index c4e164bd6c..5865007a4e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Floor.java +++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java @@ -60,7 +60,7 @@ final class Floor extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect()) { + switch (configuration.family()) { From ed0634f0cbff643cec44f6b85b4b6f8d86d3d5d9 Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 28 May 2019 11:41:04 +0200 Subject: [PATCH 2/2] [#8695] Use Configuration#family() convenience method Replace expressions like `configuration.dialect().family()` with `configuration.family()`. --- jOOQ/src/main/java/org/jooq/DAO.java | 2 +- jOOQ/src/main/java/org/jooq/Scope.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Acos.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Asin.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Atan.java | 2 +- jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Ceil.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Cot.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Iif.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Lower.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Neg.java | 2 +- jOOQ/src/main/java/org/jooq/impl/NullIf.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Nvl2.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Power.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Sqrt.java | 2 +- jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Upper.java | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DAO.java b/jOOQ/src/main/java/org/jooq/DAO.java index 84737c5abb..b4eea31fe5 100644 --- a/jOOQ/src/main/java/org/jooq/DAO.java +++ b/jOOQ/src/main/java/org/jooq/DAO.java @@ -87,7 +87,7 @@ public interface DAO, P, T> { * The {@link SQLDialect#family()} wrapped by this context. *

* This method is a convenient way of accessing - * configuration().dialect().family(). + * configuration().family(). */ SQLDialect family(); diff --git a/jOOQ/src/main/java/org/jooq/Scope.java b/jOOQ/src/main/java/org/jooq/Scope.java index c34eef61e5..cdf9d4f5a3 100644 --- a/jOOQ/src/main/java/org/jooq/Scope.java +++ b/jOOQ/src/main/java/org/jooq/Scope.java @@ -126,7 +126,7 @@ public interface Scope { * The {@link SQLDialect#family()} wrapped by this context. *

* This method is a convenient way of accessing - * configuration().dialect().family(). + * configuration().family(). */ SQLDialect family(); diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java index a189a2f822..0fa462e5b4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Acos.java +++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java @@ -65,7 +65,7 @@ final class Acos extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java index 6ca35c0643..572be88403 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Asin.java +++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java @@ -64,7 +64,7 @@ final class Asin extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java index 1d74ef70e1..5e0b67d877 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Atan.java +++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java @@ -62,7 +62,7 @@ final class Atan extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java index e535e4376e..4af5a4f38b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java @@ -133,7 +133,7 @@ final class CaseConditionStepImpl extends AbstractFunction implements Case @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java index 2a158a08d2..04e9ca3108 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java @@ -163,7 +163,7 @@ final class CaseWhenStepImpl extends AbstractFunction implements CaseWh @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java index 586b7e849b..0983ce291f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java +++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java @@ -60,7 +60,7 @@ final class Ceil extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java index a004c179bb..7e27244020 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Cot.java +++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java @@ -64,7 +64,7 @@ final class Cot extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 6905c9726c..70d124bf04 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -540,7 +540,7 @@ public class DefaultDataType implements DataType { // If this is a SQLDataType find the most suited dialect-specific // data type if (getDialect() == null) { - DataType dataType = TYPES_BY_SQL_DATATYPE[configuration.dialect().family().ordinal()] + DataType dataType = TYPES_BY_SQL_DATATYPE[configuration.family().ordinal()] // Be sure to reset length, precision, and scale, as those values // were not registered in the below cache @@ -555,7 +555,7 @@ public class DefaultDataType implements DataType { } // If this is already the dialect's specific data type, return this - else if (getDialect().family() == configuration.dialect().family()) { + else if (getDialect().family() == configuration.family()) { return this; } diff --git a/jOOQ/src/main/java/org/jooq/impl/Iif.java b/jOOQ/src/main/java/org/jooq/impl/Iif.java index 1f95e9d03a..3ef6b3044f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Iif.java +++ b/jOOQ/src/main/java/org/jooq/impl/Iif.java @@ -66,7 +66,7 @@ final class Iif extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java index 7e8017d2a4..08fd79cd2f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lower.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java @@ -60,7 +60,7 @@ final class Lower extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Neg.java b/jOOQ/src/main/java/org/jooq/impl/Neg.java index 3436b789fd..ea2d5a1fa4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Neg.java +++ b/jOOQ/src/main/java/org/jooq/impl/Neg.java @@ -82,7 +82,7 @@ final class Neg extends AbstractField { @Override public final void accept(Context ctx) { - SQLDialect family = ctx.configuration().dialect().family(); + SQLDialect family = ctx.configuration().family(); if (operator == BIT_NOT && EMULATE_BIT_NOT.contains(family)) ctx.sql("(0 - ") diff --git a/jOOQ/src/main/java/org/jooq/impl/NullIf.java b/jOOQ/src/main/java/org/jooq/impl/NullIf.java index eb6c535f27..e908a6252f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/NullIf.java +++ b/jOOQ/src/main/java/org/jooq/impl/NullIf.java @@ -63,7 +63,7 @@ final class NullIf extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java index 6ce7ff26a2..73af7166dd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java +++ b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java @@ -64,7 +64,7 @@ final class Nvl2 extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java index 812f304b02..d8f8b840ec 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Power.java +++ b/jOOQ/src/main/java/org/jooq/impl/Power.java @@ -64,7 +64,7 @@ final class Power extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java index 64e77d1aa6..d895afed0a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java +++ b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java @@ -128,7 +128,7 @@ final class RowSubqueryCondition extends AbstractCondition { final Configuration configuration = ctx.configuration(); final RenderContext render = ctx instanceof RenderContext ? (RenderContext) ctx : null; - SQLDialect family = configuration.dialect().family(); + SQLDialect family = configuration.family(); // [#3505] TODO: Emulate this where it is not supported if (rightQuantified != null) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java index 3e0e8f6038..2657a309c5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java @@ -62,7 +62,7 @@ final class Sqrt extends AbstractFunction { @Override final Field getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java index 06f527785b..4c7bba9adc 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java @@ -419,7 +419,7 @@ public class UpdatableRecordImpl> extends TableReco // [#1547] MS Access and SQLite doesn't support FOR UPDATE. CUBRID and SQL Server // can emulate it, though! - if (!NO_SUPPORT_FOR_UPDATE.contains(create().configuration().dialect().family())) + if (!NO_SUPPORT_FOR_UPDATE.contains(create().configuration().family())) select.setForUpdate(true); R record = select.fetchOne(); diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java index 63136a4d13..41ceb037be 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Upper.java +++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java @@ -60,7 +60,7 @@ final class Upper extends AbstractFunction { @Override final QueryPart getFunction0(Configuration configuration) { - switch (configuration.dialect().family()) { + switch (configuration.family()) {