From b1d992e33bda90cee7b7e030ab4a505da2820c26 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 13 May 2019 12:39:40 +0200
Subject: [PATCH] [#8619] Let Query subtypes extends RowCountQuery, which
 extends Publisher<Integer>

---
 jOOQ/src/main/java/org/jooq/Block.java                |  2 +-
 jOOQ/src/main/java/org/jooq/DDLQuery.java             |  2 +-
 jOOQ/src/main/java/org/jooq/Delete.java               |  2 +-
 jOOQ/src/main/java/org/jooq/Insert.java               |  2 +-
 jOOQ/src/main/java/org/jooq/Merge.java                |  2 +-
 jOOQ/src/main/java/org/jooq/StoreQuery.java           |  2 +-
 jOOQ/src/main/java/org/jooq/Update.java               |  2 +-
 .../src/main/java/org/jooq/impl/AbstractDMLQuery.java |  2 +-
 jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java  |  2 +-
 jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java |  2 +-
 .../main/java/org/jooq/impl/AlterSequenceImpl.java    |  2 +-
 jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java  |  2 +-
 jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/BlockImpl.java       |  2 +-
 jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java |  2 +-
 .../src/main/java/org/jooq/impl/CreateSchemaImpl.java |  2 +-
 .../main/java/org/jooq/impl/CreateSequenceImpl.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java |  2 +-
 jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java  |  2 +-
 jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java  |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java      |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java  |  2 +-
 .../src/main/java/org/jooq/impl/DropSequenceImpl.java |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java   |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java    |  2 +-
 jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java    |  2 +-
 jOOQ/src/main/java/org/jooq/impl/GrantImpl.java       |  3 ++-
 jOOQ/src/main/java/org/jooq/impl/InsertImpl.java      |  2 +-
 jOOQ/src/main/java/org/jooq/impl/MergeImpl.java       |  2 +-
 jOOQ/src/main/java/org/jooq/impl/ParserImpl.java      | 11 ++---------
 jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java      |  2 +-
 jOOQ/src/main/java/org/jooq/impl/SQLQuery.java        |  2 +-
 jOOQ/src/main/java/org/jooq/impl/SetCatalog.java      |  2 +-
 jOOQ/src/main/java/org/jooq/impl/SetSchema.java       |  2 +-
 jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java    |  2 +-
 jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java      |  2 +-
 38 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/Block.java b/jOOQ/src/main/java/org/jooq/Block.java
index adcea576b1..fe26aaa310 100644
--- a/jOOQ/src/main/java/org/jooq/Block.java
+++ b/jOOQ/src/main/java/org/jooq/Block.java
@@ -78,6 +78,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Block extends Query {
+public interface Block extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DDLQuery.java b/jOOQ/src/main/java/org/jooq/DDLQuery.java
index 2063dd31ff..4dec51150e 100644
--- a/jOOQ/src/main/java/org/jooq/DDLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/DDLQuery.java
@@ -42,6 +42,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface DDLQuery extends Query {
+public interface DDLQuery extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Delete.java b/jOOQ/src/main/java/org/jooq/Delete.java
index c62ba8209c..3271e51a38 100644
--- a/jOOQ/src/main/java/org/jooq/Delete.java
+++ b/jOOQ/src/main/java/org/jooq/Delete.java
@@ -59,6 +59,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Delete<R extends Record> extends Query {
+public interface Delete<R extends Record> extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Insert.java b/jOOQ/src/main/java/org/jooq/Insert.java
index d790b40ab1..9c0c4358c3 100644
--- a/jOOQ/src/main/java/org/jooq/Insert.java
+++ b/jOOQ/src/main/java/org/jooq/Insert.java
@@ -59,6 +59,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Insert<R extends Record> extends Query {
+public interface Insert<R extends Record> extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/Merge.java b/jOOQ/src/main/java/org/jooq/Merge.java
index cf4a3edd2b..be7f23ebde 100644
--- a/jOOQ/src/main/java/org/jooq/Merge.java
+++ b/jOOQ/src/main/java/org/jooq/Merge.java
@@ -63,6 +63,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Merge<R extends Record> extends Query {
+public interface Merge<R extends Record> extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/StoreQuery.java b/jOOQ/src/main/java/org/jooq/StoreQuery.java
index 52aa71ad4b..0b96c2db18 100644
--- a/jOOQ/src/main/java/org/jooq/StoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/StoreQuery.java
@@ -49,7 +49,7 @@ import java.util.Map;
  * @param <R> The record type of the table being modified
  * @author Lukas Eder
  */
-public interface StoreQuery<R extends Record> extends Query {
+public interface StoreQuery<R extends Record> extends RowCountQuery {
 
     /**
      * Add values to the store statement
diff --git a/jOOQ/src/main/java/org/jooq/Update.java b/jOOQ/src/main/java/org/jooq/Update.java
index c9e7ca5003..48776a94b2 100644
--- a/jOOQ/src/main/java/org/jooq/Update.java
+++ b/jOOQ/src/main/java/org/jooq/Update.java
@@ -59,6 +59,6 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Update<R extends Record> extends Query {
+public interface Update<R extends Record> extends RowCountQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index fee67c03ed..753de365e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -121,7 +121,7 @@ import org.jooq.tools.jdbc.JDBCUtils;
 /**
  * @author Lukas Eder
  */
-abstract class AbstractDMLQuery<R extends Record> extends AbstractQuery {
+abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
index e42f50720c..fad398d2d8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
@@ -79,7 +79,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class AlterIndexImpl extends AbstractQuery implements
+final class AlterIndexImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for ALTER INDEX behaviour
     AlterIndexOnStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index bed353b4c5..43dec17e1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -56,7 +56,7 @@ import org.jooq.Schema;
 /**
  * @author Lukas Eder
  */
-final class AlterSchemaImpl extends AbstractQuery implements
+final class AlterSchemaImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for ALTER SCHEMA behaviour
     AlterSchemaStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 0eb724e266..59a2062123 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -80,7 +80,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-final class AlterSequenceImpl<T extends Number> extends AbstractQuery implements
+final class AlterSequenceImpl<T extends Number> extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for AlterSequence behaviour
     AlterSequenceStep<T>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 0f2c5c985b..92d90f5ccb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -166,7 +166,7 @@ import org.jooq.Table;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-final class AlterTableImpl extends AbstractQuery implements
+final class AlterTableImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for ALTER TABLE behaviour
     AlterTableStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
index f06eadaea8..003026c8ae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
@@ -79,7 +79,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class AlterViewImpl extends AbstractQuery implements
+final class AlterViewImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for ALTER VIEW behaviour
     AlterViewStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
index 98ddd3ac7d..4223816542 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BlockImpl.java
@@ -88,7 +88,7 @@ import org.jooq.Statement;
 /**
  * @author Lukas Eder
  */
-final class BlockImpl extends AbstractQuery implements Block {
+final class BlockImpl extends AbstractRowCountQuery implements Block {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
index 61aa33aaeb..a52ebc1f2d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@@ -73,7 +73,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class CommentOnImpl extends AbstractQuery
+class CommentOnImpl extends AbstractRowCountQuery
 implements
     CommentOnIsStep,
     CommentOnFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
index 8b61a368a1..5f23671997 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -89,7 +89,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class CreateIndexImpl extends AbstractQuery implements
+final class CreateIndexImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE INDEX behaviour
     CreateIndexStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
index 90e4560bb7..69264fd2a3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -69,7 +69,7 @@ import org.jooq.Schema;
 /**
  * @author Lukas Eder
  */
-final class CreateSchemaImpl<R extends Record> extends AbstractQuery implements
+final class CreateSchemaImpl<R extends Record> extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE SCHEMA behaviour
     CreateSchemaFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index 681c846684..43f683016e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -74,7 +74,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-final class CreateSequenceImpl extends AbstractQuery implements
+final class CreateSequenceImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE SEQUENCE behaviour
     CreateSequenceFlagsStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 84d2d693ff..113b66186b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -126,7 +126,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class CreateTableImpl extends AbstractQuery implements
+final class CreateTableImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE TABLE behaviour
     CreateTableWithDataStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
index 1aa4c7a186..b17ffe376c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java
@@ -58,7 +58,7 @@ import org.jooq.conf.ParamType;
 /**
  * @author Lukas Eder
  */
-final class CreateTypeImpl extends AbstractQuery implements
+final class CreateTypeImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE TYPE behaviour
     CreateTypeStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
index db5dbc5d48..ff3eb27381 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
@@ -86,7 +86,7 @@ import org.jooq.conf.ParamType;
 /**
  * @author Lukas Eder
  */
-final class CreateViewImpl<R extends Record> extends AbstractQuery implements
+final class CreateViewImpl<R extends Record> extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE VIEW behaviour
     CreateViewAsStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
index 9ace33d616..93fb4ed4b4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
@@ -90,7 +90,7 @@ import org.jooq.Table;
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 final class DeleteImpl<R extends Record>
-    extends AbstractDelegatingQuery<DeleteQueryImpl<R>>
+    extends AbstractDelegatingRowCountQuery<DeleteQueryImpl<R>>
     implements
 
     // Cascading interface implementations for Delete behaviour
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
index 0c46a0d111..ddb84b420e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@@ -74,7 +74,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class DropIndexImpl extends AbstractQuery implements
+final class DropIndexImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for DROP INDEX behaviour
     DropIndexOnStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
index 871a6ffbb0..f16340f5a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -71,7 +71,7 @@ import org.jooq.Schema;
 /**
  * @author Lukas Eder
  */
-final class DropSchemaImpl extends AbstractQuery implements
+final class DropSchemaImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for DROP VIEW behaviour
     DropSchemaStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 06f7a9fb0a..cc4b13b9d4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -66,7 +66,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-final class DropSequenceImpl extends AbstractQuery implements
+final class DropSequenceImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for DROP SEQUENCE behaviour
     DropSequenceFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index 14ac4d8f6a..eb11cf45e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -64,7 +64,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class DropTableImpl extends AbstractQuery implements
+final class DropTableImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for DROP TABLE behaviour
     DropTableStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
index 5e129f69a6..10492d0038 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTypeImpl.java
@@ -54,7 +54,7 @@ import org.jooq.Name;
 /**
  * @author Lukas Eder
  */
-final class DropTypeImpl extends AbstractQuery implements
+final class DropTypeImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for CREATE TYPE behaviour
     DropTypeStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index 8d668eed5d..96978d067b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -64,7 +64,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-final class DropViewImpl extends AbstractQuery implements
+final class DropViewImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for DROP VIEW behaviour
     DropViewFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
index 401628da5f..978872cfb1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -64,9 +64,10 @@ import org.jooq.User;
 
 /**
  * Grant privilege or privileges on a table to user or role.
+ *
  * @author Timur Shaidullin
  */
-final class GrantImpl extends AbstractQuery implements
+final class GrantImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for Select behaviour
     GrantOnStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
index 1e97bf2df7..995773e898 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -123,7 +123,7 @@ import org.jooq.UniqueKey;
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>
-    extends AbstractDelegatingQuery<InsertQuery<R>>
+    extends AbstractDelegatingRowCountQuery<InsertQuery<R>>
     implements
 
     // Cascading interface implementations for Insert behaviour
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index b567849b15..3202d7da19 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -165,7 +165,7 @@ import org.jooq.tools.StringUtils;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-final class MergeImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractQuery
+final class MergeImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractRowCountQuery
 implements
 
     // Cascading interface implementations for Merge behaviour
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index d7a834338d..8efa041518 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -408,7 +408,6 @@ import org.jooq.QualifiedAsterisk;
 import org.jooq.Queries;
 import org.jooq.Query;
 import org.jooq.QueryPart;
-import org.jooq.QueryPartInternal;
 import org.jooq.Record;
 import org.jooq.ResultQuery;
 import org.jooq.RevokeFromStep;
@@ -10017,14 +10016,8 @@ final class ParserImpl implements Parser {
         "FOR"
     };
 
-    private static final Ignore   IGNORE              = Reflect.on(DSL.query("/* ignored */")).as(Ignore.class);
-    private static final Ignore   IGNORE_NO_DELIMITER = Reflect.on(DSL.query("/* ignored */")).as(Ignore.class);
-
-    private static interface Ignore
-    extends
-        DDLQuery,
-        ResultQuery<Record>,
-        QueryPartInternal {}
+    private static final DDLQuery IGNORE              = Reflect.on(DSL.query("/* ignored */")).as(DDLQuery.class);
+    private static final Query    IGNORE_NO_DELIMITER = Reflect.on(DSL.query("/* ignored */")).as(Query.class);
 }
 
 final class ParserContext {
diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
index 013de71595..8a5211b780 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -69,7 +69,7 @@ import org.jooq.User;
  *
  * @author Timur Shaidullin
  */
-final class RevokeImpl extends AbstractQuery implements
+final class RevokeImpl extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for Select behaviour
     RevokeOnStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java b/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
index 714197dc86..0e465faa1a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
@@ -46,7 +46,7 @@ import org.jooq.QueryPartInternal;
 /**
  * @author Lukas Eder
  */
-final class SQLQuery extends AbstractQuery {
+final class SQLQuery extends AbstractRowCountQuery {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
index 7d448440f1..6dd90c1cbd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
@@ -48,7 +48,7 @@ import org.jooq.Context;
 /**
  * @author Lukas Eder
  */
-final class SetCatalog extends AbstractQuery {
+final class SetCatalog extends AbstractRowCountQuery {
 
     private static final long serialVersionUID = -3996953205762741746L;
     private final Catalog     catalog;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
index 19c3eca940..5239046e60 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
@@ -52,7 +52,7 @@ import org.jooq.Schema;
 /**
  * @author Lukas Eder
  */
-final class SetSchema extends AbstractQuery {
+final class SetSchema extends AbstractRowCountQuery {
 
     private static final long serialVersionUID = -3996953205762741746L;
     private final Schema      schema;
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
index 4bb3d8bac2..91d6b040cc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
@@ -61,7 +61,7 @@ import org.jooq.TruncateIdentityStep;
 /**
  * @author Lukas Eder
  */
-final class TruncateImpl<R extends Record> extends AbstractQuery implements
+final class TruncateImpl<R extends Record> extends AbstractRowCountQuery implements
 
     // Cascading interface implementations for Truncate behaviour
     TruncateIdentityStep<R> {
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
index d0451574da..f4f43dda57 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
@@ -123,7 +123,7 @@ import org.jooq.UpdateWhereStep;
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 final class UpdateImpl<R extends Record>
-    extends AbstractDelegatingQuery<UpdateQuery<R>>
+    extends AbstractDelegatingRowCountQuery<UpdateQuery<R>>
     implements
 
     // Cascading interface implementations for Update behaviour