From d77e77696b10f1c6fe95c99f357330cb369eb077 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 15 Oct 2014 18:29:15 +0200
Subject: [PATCH] [#3579] More meaningful API

---
 jOOQ/src/main/java/org/jooq/SelectOptionStep.java |  4 ++--
 jOOQ/src/main/java/org/jooq/SelectUnionStep.java  | 10 +++++-----
 jOOQ/src/main/java/org/jooq/SelectWindowStep.java |  6 +++---
 jOOQ/src/main/java/org/jooq/impl/SelectImpl.java  |  5 ++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/SelectOptionStep.java b/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
index 17e2dc4cdf..333f9ea552 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOptionStep.java
@@ -83,7 +83,7 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface SelectOptionStep<R extends Record> extends SelectFinalStep<R> {
+public interface SelectOptionStep<R extends Record> extends SelectUnionStep<R> {
 
     /**
      * Add a SQL Server-style query hint to the select clause.
@@ -115,5 +115,5 @@ public interface SelectOptionStep<R extends Record> extends SelectFinalStep<R> {
      * @see SelectQuery#addOption(String)
      */
     @Support
-    SelectFinalStep<R> option(String string);
+    SelectUnionStep<R> option(String string);
 }
diff --git a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
index 2a229c433e..f5916e398a 100644
--- a/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectUnionStep.java
@@ -97,33 +97,33 @@ import static org.jooq.SQLDialect.SQLITE;
  *
  * @author Lukas Eder
  */
-public interface SelectUnionStep<R extends Record> extends SelectOrderByStep<R> {
+public interface SelectUnionStep<R extends Record> extends SelectFinalStep<R> {
 
     /**
      * Combine with other selects
      */
     @Override
     @Support
-    SelectUnionStep<R> union(Select<? extends R> select);
+    SelectOrderByStep<R> union(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Override
     @Support
-    SelectUnionStep<R> unionAll(Select<? extends R> select);
+    SelectOrderByStep<R> unionAll(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Override
     @Support({ CUBRID, DERBY, H2, HSQLDB, POSTGRES, SQLITE })
-    SelectUnionStep<R> except(Select<? extends R> select);
+    SelectOrderByStep<R> except(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Override
     @Support({ CUBRID, DERBY, H2, HSQLDB, POSTGRES, SQLITE })
-    SelectUnionStep<R> intersect(Select<? extends R> select);
+    SelectOrderByStep<R> intersect(Select<? extends R> select);
 }
diff --git a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
index bbd5b33a2b..5e99ebfc64 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWindowStep.java
@@ -92,7 +92,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface SelectWindowStep<R extends Record> extends SelectUnionStep<R> {
+public interface SelectWindowStep<R extends Record> extends SelectOrderByStep<R> {
 
     /**
      * Add a <code>WINDOW</code> clause to the statement.
@@ -106,7 +106,7 @@ public interface SelectWindowStep<R extends Record> extends SelectUnionStep<R> {
      * will inline window definitions where they are referenced.
      */
     @Support({ CUBRID, POSTGRES })
-    SelectUnionStep<R> window(WindowDefinition... definitions);
+    SelectOrderByStep<R> window(WindowDefinition... definitions);
 
     /**
      * Add a <code>WINDOW</code> clause to the statement.
@@ -120,5 +120,5 @@ public interface SelectWindowStep<R extends Record> extends SelectUnionStep<R> {
      * will inline window definitions where they are referenced.
      */
     @Support({ CUBRID, POSTGRES })
-    SelectUnionStep<R> window(Collection<? extends WindowDefinition> definitions);
+    SelectOrderByStep<R> window(Collection<? extends WindowDefinition> definitions);
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 904b971cdc..c801bfa72a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -111,7 +111,6 @@ import org.jooq.SelectSeekStep8;
 import org.jooq.SelectSeekStep9;
 import org.jooq.SelectSeekStepN;
 import org.jooq.SelectSelectStep;
-import org.jooq.SelectUnionStep;
 import org.jooq.SortField;
 import org.jooq.Table;
 import org.jooq.TableField;
@@ -1914,13 +1913,13 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
     }
 
     @Override
-    public final SelectUnionStep<R> window(WindowDefinition... definitions) {
+    public final SelectImpl window(WindowDefinition... definitions) {
         getQuery().addWindow(definitions);
         return this;
     }
 
     @Override
-    public final SelectUnionStep<R> window(Collection<? extends WindowDefinition> definitions) {
+    public final SelectImpl window(Collection<? extends WindowDefinition> definitions) {
         getQuery().addWindow(definitions);
         return this;
     }