diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 23197623df..9f7d536026 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -12249,7 +12249,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query startTransaction();
+    RowCountQuery startTransaction();
 
     /**
      * The <code>SAVEPOINT</code> statement.
@@ -12260,7 +12260,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query savepoint(@Stringly.Name String name);
+    RowCountQuery savepoint(@Stringly.Name String name);
 
     /**
      * The <code>SAVEPOINT</code> statement.
@@ -12271,7 +12271,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query savepoint(Name name);
+    RowCountQuery savepoint(Name name);
 
     /**
      * The <code>RELEASE SAVEPOINT</code> statement.
@@ -12282,7 +12282,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query releaseSavepoint(@Stringly.Name String name);
+    RowCountQuery releaseSavepoint(@Stringly.Name String name);
 
     /**
      * The <code>RELEASE SAVEPOINT</code> statement.
@@ -12293,7 +12293,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query releaseSavepoint(Name name);
+    RowCountQuery releaseSavepoint(Name name);
 
     /**
      * The <code>COMMIT</code> statement.
@@ -12304,7 +12304,7 @@ public interface DSLContext extends Scope {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    Query commit();
+    RowCountQuery commit();
 
     /**
      * The <code>ROLLBACK</code> statement.
diff --git a/jOOQ/src/main/java/org/jooq/RollbackToSavepointStep.java b/jOOQ/src/main/java/org/jooq/RollbackToSavepointStep.java
index 0794f1d613..e15d23f338 100644
--- a/jOOQ/src/main/java/org/jooq/RollbackToSavepointStep.java
+++ b/jOOQ/src/main/java/org/jooq/RollbackToSavepointStep.java
@@ -68,19 +68,19 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
-public interface RollbackToSavepointStep extends Query {
+public interface RollbackToSavepointStep extends RowCountQuery {
 
     /**
      * Add the <code>TO SAVEPOINT</code> clause to the <code>ROLLBACK</code> statement.
      */
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     @NotNull @CheckReturnValue
-    Query toSavepoint(@Stringly.Name String toSavepoint);
+    RowCountQuery toSavepoint(@Stringly.Name String toSavepoint);
 
     /**
      * Add the <code>TO SAVEPOINT</code> clause to the <code>ROLLBACK</code> statement.
      */
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
     @NotNull @CheckReturnValue
-    Query toSavepoint(Name toSavepoint);
+    RowCountQuery toSavepoint(Name toSavepoint);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 5b31a154dd..ea275865eb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -12027,7 +12027,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query startTransaction() {
+    public static org.jooq.RowCountQuery startTransaction() {
         return dsl().startTransaction();
     }
 
@@ -12044,7 +12044,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query savepoint(@Stringly.Name String name) {
+    public static org.jooq.RowCountQuery savepoint(@Stringly.Name String name) {
         return dsl().savepoint(name);
     }
 
@@ -12061,7 +12061,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query savepoint(Name name) {
+    public static org.jooq.RowCountQuery savepoint(Name name) {
         return dsl().savepoint(name);
     }
 
@@ -12078,7 +12078,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query releaseSavepoint(@Stringly.Name String name) {
+    public static org.jooq.RowCountQuery releaseSavepoint(@Stringly.Name String name) {
         return dsl().releaseSavepoint(name);
     }
 
@@ -12095,7 +12095,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query releaseSavepoint(Name name) {
+    public static org.jooq.RowCountQuery releaseSavepoint(Name name) {
         return dsl().releaseSavepoint(name);
     }
 
@@ -12112,7 +12112,7 @@ public class DSL {
      */
     @NotNull @CheckReturnValue
     @Support({ FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES, SQLITE, YUGABYTEDB })
-    public static org.jooq.Query commit() {
+    public static org.jooq.RowCountQuery commit() {
         return dsl().commit();
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 11671a6342..40603fc53f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -4541,32 +4541,32 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
 
 
     @Override
-    public org.jooq.Query startTransaction() {
+    public org.jooq.RowCountQuery startTransaction() {
         return new StartTransaction(configuration());
     }
 
     @Override
-    public org.jooq.Query savepoint(@Stringly.Name String name) {
+    public org.jooq.RowCountQuery savepoint(@Stringly.Name String name) {
         return new Savepoint(configuration(), DSL.name(name));
     }
 
     @Override
-    public org.jooq.Query savepoint(Name name) {
+    public org.jooq.RowCountQuery savepoint(Name name) {
         return new Savepoint(configuration(), name);
     }
 
     @Override
-    public org.jooq.Query releaseSavepoint(@Stringly.Name String name) {
+    public org.jooq.RowCountQuery releaseSavepoint(@Stringly.Name String name) {
         return new ReleaseSavepoint(configuration(), DSL.name(name));
     }
 
     @Override
-    public org.jooq.Query releaseSavepoint(Name name) {
+    public org.jooq.RowCountQuery releaseSavepoint(Name name) {
         return new ReleaseSavepoint(configuration(), name);
     }
 
     @Override
-    public org.jooq.Query commit() {
+    public org.jooq.RowCountQuery commit() {
         return new Commit(configuration());
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/QOM.java b/jOOQ/src/main/java/org/jooq/impl/QOM.java
index 644e3bf3b7..cf469e696e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QOM.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QOM.java
@@ -2880,7 +2880,7 @@ public final class QOM {
     public /*sealed*/ interface StartTransaction
         extends
             UEmpty,
-            org.jooq.Query
+            org.jooq.RowCountQuery
         //permits
         //    StartTransaction
     {}
@@ -2892,7 +2892,7 @@ public final class QOM {
      */
     public /*sealed*/ interface Savepoint
         extends
-            org.jooq.Query
+            org.jooq.RowCountQuery
         //permits
         //    Savepoint
     {
@@ -2908,7 +2908,7 @@ public final class QOM {
      */
     public /*sealed*/ interface ReleaseSavepoint
         extends
-            org.jooq.Query
+            org.jooq.RowCountQuery
         //permits
         //    ReleaseSavepoint
     {
@@ -2925,7 +2925,7 @@ public final class QOM {
     public /*sealed*/ interface Commit
         extends
             UEmpty,
-            org.jooq.Query
+            org.jooq.RowCountQuery
         //permits
         //    Commit
     {}