diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
index aae8374e5a..95dd3c3972 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/Databases.java
@@ -78,20 +78,7 @@ public class Databases {
     public static final Class<? extends Database> databaseClass(SQLDialect dialect) {
         Class<? extends Database> result = JDBCDatabase.class;
 
-        switch (dialect) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+        switch (dialect.family()) {
 
 
 
@@ -112,31 +99,12 @@ public class Databases {
 
             case CUBRID:           result = CUBRIDDatabase.class;           break;
             case DERBY:            result = DerbyDatabase.class;            break;
-
-
-
-
             case FIREBIRD:         result = FirebirdDatabase.class;         break;
             case H2:               result = H2Database.class;               break;
             case HSQLDB:           result = HSQLDBDatabase.class;           break;
             case MARIADB:          result = MariaDBDatabase.class;          break;
-
-
-
-
             case MYSQL:            result = MySQLDatabase.class;            break;
-
-
-
-
-
-
-
             case POSTGRES:         result = PostgresDatabase.class;         break;
-
-
-
-
             case SQLITE:           result = SQLiteDatabase.class;           break;
 
             case DEFAULT:
diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java
index 9e55002f3d..b75c6ddd4d 100644
--- a/jOOQ/src/main/java/org/jooq/SQLDialect.java
+++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java
@@ -131,6 +131,43 @@ public enum SQLDialect {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * The MySQL dialect family.
      */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index a6a2a1d4cd..71488dfa00 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -274,6 +274,14 @@ final class Limit extends AbstractQueryPart {
 
             // [#4785] OFFSET cannot be without LIMIT
             case MARIADB:
+
+
+
+
+
+
+
+
             case MYSQL:
             case SQLITE: {
                 ctx.castMode(NEVER)
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 3612f0dc61..b2db4a2070 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -686,6 +686,12 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+
+
+
+
+
+