diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java
index 3331fe8372..39093a9435 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationUtil.java
@@ -189,6 +189,9 @@ class GenerationUtil {
                 return H2DataType.OTHER.getTypeName();
             }
 
+            /* [pro] xx
+            xxxx xxxxx
+            xx [/pro] */
             case HSQLDB: {
 
                 // In HSQLDB 2.2.5, there has been an incompatible INFORMATION_SCHEMA change around the
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index af37cdfd57..00fe658a5f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -1047,10 +1047,12 @@ public abstract class AbstractDatabase implements Database {
             case H2:
                 return "ARRAY".equals(dataType);
             case HSQLDB:
+            /* [pro] xx
+            xxxx xxxxx
+            xx [/pro] */
+            default:
                 return dataType.endsWith("ARRAY");
         }
-
-        return false;
     }
 
     protected static final String fetchedSize(List<?> fetched, List<?> included) {
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/Databases.java b/jOOQ-meta/src/main/java/org/jooq/util/Databases.java
index ccb657d4d5..8a986c1196 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/Databases.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/Databases.java
@@ -47,6 +47,7 @@ import org.jooq.util.cubrid.CUBRIDDatabase;
 import org.jooq.util.derby.DerbyDatabase;
 import org.jooq.util.firebird.FirebirdDatabase;
 import org.jooq.util.h2.H2Database;
+// ...
 import org.jooq.util.hsqldb.HSQLDBDatabase;
 // ...
 // ...
@@ -78,6 +79,7 @@ public class Databases {
             xxxx xxxxxxx    xxxxxx x xxxxxxxxxxxxxxxxxxx      xxxxxx
             xxxx xxxx       xxxxxx x xxxxxxxxxxxxxxxxxx       xxxxxx
             xxxx xxxx       xxxxxx x xxxxxxxxxxxxxxxxxx       xxxxxx
+            xxxx xxxxx      xxxxxx x xxxxxxxxxxxxxxxxxxx      xxxxxx
             xxxx xxxxxxxxx  xxxxxx x xxxxxxxxxxxxxxxxxxxxxxx  xxxxxx
             xxxx xxxxxxx    xxxxxx x xxxxxxxxxxxxxxxxxxxxx    xxxxxx
             xxxx xxxxxxx    xxxxxx x xxxxxxxxxxxxxxxxxxxxx    xxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/AggregateFunction.java b/jOOQ/src/main/java/org/jooq/AggregateFunction.java
index 93301e688f..24f50dfb03 100644
--- a/jOOQ/src/main/java/org/jooq/AggregateFunction.java
+++ b/jOOQ/src/main/java/org/jooq/AggregateFunction.java
@@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.H2;
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java
index d549bc4856..d49fd7dd90 100644
--- a/jOOQ/src/main/java/org/jooq/SQLDialect.java
+++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java
@@ -174,6 +174,13 @@ public enum SQLDialect {
      xx
     xxxxxxxxxxxxx xxxxx xxxxx
 
+    xxx
+     x xxx xxx xxxx xxx xxxxxxxx
+     x xxx
+     x xxxx xxxxxxx xx xxxxxxxxx xx xxxxxxxxxx xxxx xxxxxxxxxxxxxx xxxxx
+     xx
+    xxxxxxxxxxxx xxxxxx
+
     xxx
      x xxx xxxxxxxx xxx xxxxxxxx
      x xxx
diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java
index 7fe4a20987..07ec8727bb 100644
--- a/jOOQ/src/main/java/org/jooq/Select.java
+++ b/jOOQ/src/main/java/org/jooq/Select.java
@@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
index f5916e398a..3654d56c82 100644
--- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
@@ -45,6 +45,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
index 5e99ebfc64..20eaafde68 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/Support.java b/jOOQ/src/main/java/org/jooq/Support.java
index 3478453e11..a1db8eaf5d 100644
--- a/jOOQ/src/main/java/org/jooq/Support.java
+++ b/jOOQ/src/main/java/org/jooq/Support.java
@@ -44,6 +44,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -80,6 +81,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RUNTIME)
 @Documented
+@Inherited
 public @interface Support {
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
index 1388f0354a..93ece7cb7b 100644
--- a/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowOrderByStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/WindowOverStep.java b/jOOQ/src/main/java/org/jooq/WindowOverStep.java
index d68645d26c..30ef7faf87 100644
--- a/jOOQ/src/main/java/org/jooq/WindowOverStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowOverStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
index 890ed751b0..1c1972b1eb 100644
--- a/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowPartitionByStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java
index 3ef29306e8..4cc190c3e6 100644
--- a/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationOrderByStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java
index 0156f921d3..d119ecb131 100644
--- a/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationPartitionByStep.java
@@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index 019864608d..355d0e77d4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -289,8 +289,9 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
                 case H2:
                 /* [pro] xx
                 xxxx xxxx
+                xxxx xxxxx
 
-                xx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxx xxx
+                xx xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxx xxxx
                 xxxx xxxxxxx
                 xx [/pro] */
                     return executeSelect();
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
index f9b42777ae..6402fd0a1f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
@@ -82,6 +82,7 @@ class CurrentDate extends AbstractFunction<Date> {
                 xxxxxx xxxxxxxxxxxxxxx xxxx xx xxxxxx xxxxxxxxxxxxxxxxxx
 
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xx [/pro] */
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
index 1a4fd29076..9f6bc0b2f9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
@@ -76,6 +76,7 @@ class CurrentTime extends AbstractFunction<Time> {
                 xxxxxx xxxxxxxxxxxxxxx xxxx xx xxxxxxxxx xxxxxxxxxxxxxxxxxx
 
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xx [/pro] */
             case DERBY:
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
index 70a12537ee..5ccb2c1ea7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
@@ -82,6 +82,7 @@ class CurrentTimestamp extends AbstractFunction<Timestamp> {
                 xxxxxx xxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
 
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
             xx [/pro] */
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index e687808854..d94cb43f7a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -73,6 +73,7 @@ class CurrentUser extends AbstractFunction<String> {
                 xxxxxx xxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx
 
             xxxx xxxx
+            xxxx xxxxx
             xxxx xxxxxxx
             xxxx xxxxxxxxxx
             xxxx xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index bdb7556839..0ae70e3bb8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -47,6 +47,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java
index 6fbad8e1cf..492eec0a0a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Dual.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java
@@ -153,6 +153,7 @@ class Dual extends AbstractTable<Record> {
                     xxxxxxxxxxxxxxxxxxxx x xx xxxxx xx xxxxxxx
                     xxxxxx
 
+                xxxx xxxxx
                 xxxx xxxxxxx
                     xxxxxxxxxxxxxxxxxx
                        xxxxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
index 4c64a4395a..0daec9c322 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
@@ -49,6 +49,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
@@ -114,14 +115,14 @@ class IsDistinctFrom<T> extends AbstractCondition {
     private final QueryPartInternal delegate(Configuration configuration) {
 
         // [#3511] These dialects need to emulate the IS DISTINCT FROM predicate, optimally using INTERSECT...
-        if (asList(CUBRID, DERBY).contains(configuration.dialect().family())) {
+        if (asList(CUBRID, DERBY).contains(configuration.family())) {
             return (comparator == IS_DISTINCT_FROM)
                 ? (QueryPartInternal) notExists(select(lhs).intersect(select(rhs)))
                 : (QueryPartInternal) exists(select(lhs).intersect(select(rhs)));
         }
 
         // ... or using a more verbose CASE expression
-        else if (asList().contains(configuration.dialect().family())) {
+        else if (asList().contains(configuration.family())) {
             if (caseExpression == null) {
                 if (comparator == Comparator.IS_DISTINCT_FROM) {
                     caseExpression = (QueryPartInternal) decode()
@@ -147,7 +148,7 @@ class IsDistinctFrom<T> extends AbstractCondition {
         }
 
         // MySQL knows the <=> operator
-        else if (asList(MARIADB, MYSQL).contains(configuration.dialect())) {
+        else if (asList(MARIADB, MYSQL).contains(configuration.family())) {
             if (mySQLCondition == null) {
                 if (comparator == IS_DISTINCT_FROM) {
                     mySQLCondition = (QueryPartInternal) condition("{not}({0} <=> {1})", lhs, rhs);
@@ -161,7 +162,7 @@ class IsDistinctFrom<T> extends AbstractCondition {
         }
 
         // SQLite knows the IS / IS NOT predicate
-        else if (SQLITE == configuration.dialect()) {
+        else if (SQLITE == configuration.family()) {
             if (sqliteCondition == null) {
                 if (comparator == IS_DISTINCT_FROM) {
                     sqliteCondition = (QueryPartInternal) condition("{0} {is not} {1}", lhs, rhs);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index 0e2f513953..38ca479da0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -69,6 +69,7 @@ class Repeat extends AbstractFunction<String> {
     final Field<String> getFunction0(Configuration configuration) {
         switch (configuration.dialect().family()) {
             /* [pro] xx
+            xxxx xxxxx
             xxxx xxxxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Term.java b/jOOQ/src/main/java/org/jooq/impl/Term.java
index 262cbbe625..cf5dac8a0e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Term.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Term.java
@@ -101,6 +101,7 @@ enum Term {
                     xxxxxx xxxxxx
 
                 xxxx xxxx
+                xxxx xxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxx
                 xxxx xxxxxxx
@@ -186,6 +187,7 @@ enum Term {
             /* [pro] xx
             xxxxxx xxxxxxxxxxxxxxxxxx x
                 xxxx xxxx
+                xxxx xxxxx
                     xxxxxx xxxxxxxxx
 
                 xxxx xxxxxxxxx
@@ -205,6 +207,7 @@ enum Term {
             /* [pro] xx
             xxxxxx xxxxxxxxxxxxxxxxxx x
                 xxxx xxxx
+                xxxx xxxxx
                     xxxxxx xxxxxxxxx
 
                 xxxx xxxxxxxxx
@@ -227,6 +230,9 @@ enum Term {
                 xxxx xxxxxxxxx
                     xxxxxx xxxxxxxxxxx
 
+                xxxx xxxxx
+                    xxxxxx xxxxxx
+
                 xxxx xxxxxxxxxx
                     xxxxxx xxxxxxx
             x
@@ -244,6 +250,9 @@ enum Term {
                 xxxx xxxxxxxxx
                     xxxxxx xxxxxxxxxxx
 
+                xxxx xxxxx
+                    xxxxxx xxxxxx
+
                 xxxx xxxxxxxxxx
                     xxxxxx xxxxxx
             x
diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
index c41cb46714..9d96245359 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
@@ -43,6 +43,7 @@ package org.jooq.impl;
 import static java.util.Arrays.asList;
 import static org.jooq.SQLDialect.CUBRID;
 // ...
+// ...
 import static org.jooq.impl.DSL.one;
 
 import java.util.Arrays;
@@ -90,7 +91,8 @@ class WindowSpecificationImpl extends AbstractQueryPart implements
         if (!partitionBy.isEmpty()) {
 
             // Ignore PARTITION BY 1 clause. These databases erroneously map the
-            // 1 literal onto the column index
+            // 1 literal onto the column index (CUBRID, Sybase), or do not support
+            // constant expressions in the PARTITION BY clause (HANA)
             if (partitionByOne && asList(CUBRID).contains(ctx.configuration().dialect())) {
             }
             else {
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 aad0ce1011..ab28ab46a5 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/JDBCUtils.java
@@ -46,6 +46,7 @@ import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.DERBY;
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
+// ...
 import static org.jooq.SQLDialect.HSQLDB;
 // ...
 // ...
@@ -157,6 +158,9 @@ public class JDBCUtils {
         xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
             xxxxxx xxxx
         x
+        xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+            xxxxxx xxxxx
+        x
         xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
               xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
             xxxxxx xxxxxxxxx
@@ -213,6 +217,8 @@ public class JDBCUtils {
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxx xxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+            xxxx xxxxx
+                xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx
             xxxx xxxxxxxxx
                 xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
             xxxx xxxxxxx