diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java
index c26a646856..6cc2bb5078 100644
--- a/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectLimitAfterOffsetStep.java
@@ -43,6 +43,7 @@ import org.jetbrains.annotations.*;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
diff --git a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
index 5655def36b..5ea680cb2d 100644
--- a/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectLimitStep.java
@@ -41,6 +41,7 @@ package org.jooq;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
diff --git a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
index 8d1c7a1ffb..d7acfa5164 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOffsetStep.java
@@ -43,6 +43,7 @@ import org.jetbrains.annotations.*;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DERBY;
diff --git a/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java b/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java
index 53af05af3a..297d636de1 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWithTiesAfterOffsetStep.java
@@ -40,6 +40,7 @@ package org.jooq;
 import org.jetbrains.annotations.*;
 
 
+// ...
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
diff --git a/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java b/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java
index c4ff5bfcca..dbef207e5a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWithTiesStep.java
@@ -37,6 +37,7 @@
  */
 package org.jooq;
 
+// ...
 // ...
 // ...
 import static org.jooq.SQLDialect.CUBRID;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
index 9a29a760c9..a88cd6b1d8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractWindowFunction.java
@@ -44,6 +44,7 @@ import static java.lang.Boolean.TRUE;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.H2;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index 9764ab6d62..7f7e33ae84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -99,6 +99,7 @@ extends
 
 
 
+
             default:
                 ctx.visit(function(N_COT, getDataType(), number));
                 break;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 0996eb6c90..41c0919820 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -104,6 +104,7 @@ extends
 
 
 
+
             case FIREBIRD:
             case SQLITE:
                 ctx.visit(idiv(
diff --git a/jOOQ/src/main/java/org/jooq/impl/Keywords.java b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
index 04cd35be5e..4f5fdc5ff6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Keywords.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Keywords.java
@@ -365,6 +365,7 @@ final class Keywords {
     static final Keyword K_ROWS_FROM                        = keyword("rows from");
     static final Keyword K_ROWS_ONLY                        = keyword("rows only");
     static final Keyword K_ROWS_WITH_TIES                   = keyword("rows with ties");
+    static final Keyword K_SAFE_ORDINAL                     = keyword("safe_ordinal");
     static final Keyword K_SCHEMA                           = keyword("schema");
     static final Keyword K_SCN                              = keyword("scn");
     static final Keyword K_SEARCH_PATH                      = keyword("search_path");
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index 8edfd51f94..dfc1ef4cb9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -305,6 +305,13 @@ final class Limit extends AbstractQueryPart {
 
 
 
+
+
+
+
+
+
+
             default: {
                 acceptDefault(ctx, castMode);
                 break;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java
index 98918de7a7..54131ea38e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log.java
@@ -153,6 +153,10 @@ extends
 
 
 
+
+
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 154e1199be..9d29b68f01 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -94,6 +94,7 @@ extends
 
 
 
+
             case SQLITE:
                 ctx.visit(inline(Math.PI, BigDecimal.class));
                 break;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index 3fe89d17d8..8b420f3bda 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -169,6 +169,7 @@ extends
 
 
 
+
                 case SQLITE:
                     ctx.visit(N_INSTR).sql('(').visit(in).sql(", ").visit(search).sql(')');
                     break;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 4fd4ddd899..2a376503b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -93,6 +93,7 @@ extends
 
 
 
+
             case FIREBIRD:
             case SQLITE:
                 ctx.visit(idiv(
diff --git a/pom.xml b/pom.xml
index c4836566db..fc1d24025a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <h2.version>1.4.200</h2.version>
         <sqlite.version>3.32.3.2</sqlite.version>
         <derby.version>10.14.2.0</derby.version>
-        <hsqldb.version>2.6.0</hsqldb.version>
+        <hsqldb.version>2.5.1</hsqldb.version>
 
         <!-- JDBC drivers for jOOQ-xyz-extensions modules and vendor-specific API access -->
         <postgres.version>42.2.19</postgres.version>