diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index d1e31d44ce..167906663e 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -232,6 +232,14 @@ public enum SQLDialect { + + + + + + + + @@ -1139,6 +1147,7 @@ public enum SQLDialect { + case MYSQL: return "org.hibernate.dialect.MySQL5Dialect"; diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index d1ac9e00b7..ffea6958da 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -471,6 +471,7 @@ final class InsertQueryImpl extends AbstractStoreQuery impl + case MYSQL: case MARIADB: { toSQLInsert(ctx); diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java index 5cab6ba694..1732e34009 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Limit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java @@ -276,6 +276,7 @@ final class Limit extends AbstractQueryPart { + // [#4785] OFFSET cannot be without LIMIT diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java index 78b3350eaf..136ad50b58 100644 --- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java +++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java @@ -63,6 +63,7 @@ import static org.jooq.SQLDialect.MYSQL; // ... // ... // ... +// ... import static org.jooq.SQLDialect.POSTGRES; // ... // ... @@ -187,7 +188,7 @@ public class JDBCUtils { case POSTGRES: return postgresDialect(majorVersion, minorVersion); case MYSQL: - return mysqlDialect(majorVersion); + return mysqlDialect(majorVersion, minorVersion); case FIREBIRD: return firebirdDialect(majorVersion); } @@ -269,7 +270,10 @@ public class JDBCUtils { return POSTGRES; } - private static final SQLDialect mysqlDialect(int majorVersion) { + private static final SQLDialect mysqlDialect(int majorVersion, int minorVersion) { + + +