From 223a90a155a6c9b2ec5c8de431e200816258f18d Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 17 Sep 2019 08:14:04 +0200 Subject: [PATCH] [jOOQ/jOOQ#9213] Add missing case to dialect-switch in InsertQueryImpl Cleaned up a few switch statements. --- jOOQ/src/main/java/org/jooq/SQLDialect.java | 8 ++++++++ jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java | 6 ++++++ jOOQ/src/main/java/org/jooq/impl/MD5.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Trim.java | 4 ++-- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index b75c6ddd4d..49dd405dfb 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -836,6 +836,14 @@ public enum SQLDialect { + + + + + + + + case MYSQL: return "org.hibernate.dialect.MySQL5Dialect"; diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java index ab7132eaca..f69bb0773a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java @@ -226,7 +226,7 @@ final class CaseWhenStepImpl extends AbstractField implements CaseWhenS .visit(K_CASE); int size = compareValues.size(); - switch (ctx.dialect()) { + switch (ctx.family()) { // The DERBY dialect doesn't support the simple CASE clause case DERBY: { diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index d6a2545d1d..13e64aec3d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -431,6 +431,12 @@ final class InsertQueryImpl extends AbstractStoreQuery impl + + + + + + case MYSQL: case MARIADB: { toSQLInsert(ctx); diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java index 706d44f508..b421ae5647 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MD5.java +++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java @@ -79,7 +79,7 @@ final class MD5 extends AbstractField { @Override public final void accept(Context ctx) { - switch (ctx.configuration().dialect()) { + switch (ctx.dialect()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java index 1fe0028b28..66561420f7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trim.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java @@ -71,7 +71,7 @@ final class Trim extends AbstractField { @Override public final void accept(Context ctx) { if (characters == null) { - switch (ctx.configuration().dialect()) { + switch (ctx.dialect()) { @@ -93,7 +93,7 @@ final class Trim extends AbstractField { } } else { - switch (ctx.configuration().dialect()) { + switch (ctx.dialect()) {