From 52e786b0b6464a58bece13a25e97c8ae9955bfc0 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 31 Dec 2013 16:33:01 +0100
Subject: [PATCH] Simplified DSL interface hierarchy, compatibly

---
 jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java | 2 +-
 jOOQ/src/main/java/org/jooq/InsertReturningStep.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
index bbd000a077..cbfd5125ef 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
@@ -66,7 +66,7 @@ import static org.jooq.SQLDialect.MYSQL;
  *
  * @author Lukas Eder
  */
-public interface InsertOnDuplicateStep<R extends Record> extends InsertFinalStep<R>, InsertReturningStep<R> {
+public interface InsertOnDuplicateStep<R extends Record> extends InsertReturningStep<R> {
 
     /**
      * Add an <code>ON DUPLICATE KEY UPDATE</code> clause to this insert query.
diff --git a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
index 7209f3a3d2..687f77eeb5 100644
--- a/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertReturningStep.java
@@ -74,7 +74,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface InsertReturningStep<R extends Record> {
+public interface InsertReturningStep<R extends Record> extends InsertFinalStep<R> {
 
     /**
      * Configure the <code>INSERT</code> statement to return all fields in