From 9dde94a290f18bba5da20ec61edfb950514425c9 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 28 Feb 2023 09:36:28 +0100 Subject: [PATCH] [jOOQ/jOOQ#12421] [jOOQ/jOOQ#14718] Add dialect versions for MEMSQL --- jOOQ/src/main/java/org/jooq/SQLDialect.java | 27 +++++++++++++++++++ .../java/org/jooq/impl/AbstractDMLQuery.java | 14 +++++----- jOOQ/src/main/java/org/jooq/impl/Decode.java | 2 -- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index 3aeeb74fcd..d423b86028 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -920,6 +920,30 @@ public enum SQLDialect { + + + + + + + + + + + + + + + + + + + + + + + + @@ -1520,6 +1544,9 @@ public enum SQLDialect { + + + case MYSQL: return "org.hibernate.dialect.MySQL5Dialect"; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index e805327ae4..38193bf5ee 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -38,12 +38,11 @@ package org.jooq.impl; import static java.lang.Boolean.FALSE; -import static java.lang.Boolean.TRUE; // ... // ... -import static org.jooq.SQLDialect.*; // ... // ... +import static org.jooq.SQLDialect.CUBRID; // ... import static org.jooq.SQLDialect.DERBY; // ... @@ -55,20 +54,20 @@ import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.IGNITE; // ... +// ... import static org.jooq.SQLDialect.MARIADB; // ... -// ... -// ... import static org.jooq.SQLDialect.MYSQL; // ... // ... -import static org.jooq.SQLDialect.POSTGRES; +// ... +// ... +// ... +import static org.jooq.SQLDialect.SQLITE; // ... // ... // ... // ... -// ... -import static org.jooq.SQLDialect.YUGABYTEDB; import static org.jooq.conf.SettingsTools.renderLocale; import static org.jooq.impl.CommonTableExpressionList.markTopLevelCteAndAccept; import static org.jooq.impl.DSL.name; @@ -125,7 +124,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.BiFunction; -import java.util.function.Function; import org.jooq.Asterisk; import org.jooq.Binding; diff --git a/jOOQ/src/main/java/org/jooq/impl/Decode.java b/jOOQ/src/main/java/org/jooq/impl/Decode.java index 3b77d11834..06ad02add4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Decode.java +++ b/jOOQ/src/main/java/org/jooq/impl/Decode.java @@ -51,8 +51,6 @@ import static org.jooq.SQLDialect.HSQLDB; // ... import static org.jooq.SQLDialect.MARIADB; // ... -// ... -// ... import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.POSTGRES; // ...