From 60da2df8d03fed378245cb8c5f749a2ad76741ef Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Sun, 16 Apr 2017 11:56:24 +0200
Subject: [PATCH] [#6084] Let { Update | Delete }ReturningStep extend { Update
 | Delete }FinalStep

---
 jOOQ/src/main/java/org/jooq/DeleteConditionStep.java | 2 +-
 jOOQ/src/main/java/org/jooq/DeleteReturningStep.java | 2 +-
 jOOQ/src/main/java/org/jooq/DeleteWhereStep.java     | 2 +-
 jOOQ/src/main/java/org/jooq/UpdateConditionStep.java | 2 +-
 jOOQ/src/main/java/org/jooq/UpdateReturningStep.java | 2 +-
 jOOQ/src/main/java/org/jooq/UpdateWhereStep.java     | 2 +-
 jOOQ/src/main/java/org/jooq/impl/ParserImpl.java     | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index 7ee7b02364..2a0d1e68bb 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -50,7 +50,7 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R>, DeleteReturningStep<R> {
+public interface DeleteConditionStep<R extends Record> extends DeleteReturningStep<R> {
 
     /**
      * Combine the currently assembled conditions with another one using the
diff --git a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
index c14a482a1f..05b8182f0f 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteReturningStep.java
@@ -62,7 +62,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface DeleteReturningStep<R extends Record> {
+public interface DeleteReturningStep<R extends Record> extends DeleteFinalStep<R> {
 
     /**
      * Configure the <code>DELETE</code> statement to return all fields in
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index eca943a5b1..eb0f099118 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -51,7 +51,7 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R>, DeleteReturningStep<R> {
+public interface DeleteWhereStep<R extends Record> extends DeleteReturningStep<R> {
 
     /**
      * Add conditions to the query, connecting them with each other with
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index 5cc827a1b3..469f31932b 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -52,7 +52,7 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface UpdateConditionStep<R extends Record> extends UpdateFinalStep<R>, UpdateReturningStep<R> {
+public interface UpdateConditionStep<R extends Record> extends UpdateReturningStep<R> {
 
     /**
      * Combine the currently assembled conditions with another one using the
diff --git a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
index ad8fd8af71..6f7454803a 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateReturningStep.java
@@ -65,7 +65,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface UpdateReturningStep<R extends Record> {
+public interface UpdateReturningStep<R extends Record> extends UpdateFinalStep<R> {
 
     /**
      * Configure the <code>UPDATE</code> statement to return all fields in
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index cdc42768d1..5a6cad79a0 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -53,7 +53,7 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R>, UpdateReturningStep<R> {
+public interface UpdateWhereStep<R extends Record> extends UpdateReturningStep<R> {
 
     /**
      * Add conditions to the query, connecting them with each other with
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 063c189cd1..a13c2a1fee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -842,7 +842,7 @@ class ParserImpl implements Parser {
             else
                 return s2.returning(parseFields(ctx));
         else
-            return (Delete<?>) s2;
+            return s2;
     }
 
     private static final Insert<?> parseInsert(ParserContext ctx) {
@@ -937,7 +937,7 @@ class ParserImpl implements Parser {
             else
                 return returning.returning(parseFields(ctx));
         else
-            return (Update<?>) returning;
+            return returning;
     }
 
     private static final Map<Field<?>, Object> parseSetClauseList(ParserContext ctx) {