From 09b379103f86d193fdbeac9d5f32cfa36d5133c4 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 20 Dec 2012 15:05:03 +0100
Subject: [PATCH] [#2031] Change union(Select<R>) and similar methods to
 union(Select<? extends R>)

---
 jOOQ/src/main/java/org/jooq/Select.java                |  8 ++++----
 jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java   |  8 ++++----
 jOOQ/src/main/java/org/jooq/impl/SelectImpl.java       |  8 ++++----
 jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java |  8 ++++----
 jOOQ/src/main/java/org/jooq/impl/Union.java            | 10 +++++-----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/Select.java b/jOOQ/src/main/java/org/jooq/Select.java
index 9e0f0c6a4d..f2dfdd4170 100644
--- a/jOOQ/src/main/java/org/jooq/Select.java
+++ b/jOOQ/src/main/java/org/jooq/Select.java
@@ -49,25 +49,25 @@ public interface Select<R extends Record> extends ResultQuery<R>, TableLike<R>,
      * Combine with other selects
      */
     @Support
-    Select<R> union(Select<R> select);
+    Select<R> union(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Support
-    Select<R> unionAll(Select<R> select);
+    Select<R> unionAll(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Support
-    Select<R> except(Select<R> select);
+    Select<R> except(Select<? extends R> select);
 
     /**
      * Combine with other selects
      */
     @Support
-    Select<R> intersect(Select<R> select);
+    Select<R> intersect(Select<? extends R> select);
 
     /**
      * All fields selected in this query
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
index 770fcdf7ef..ed1794e985 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
@@ -60,22 +60,22 @@ abstract class AbstractSelect<R extends Record> extends AbstractResultQuery<R> i
     }
 
     @Override
-    public final Select<R> union(Select<R> select) {
+    public final Select<R> union(Select<? extends R> select) {
         return new Union<R>(getConfiguration(), this, select, CombineOperator.UNION);
     }
 
     @Override
-    public final Select<R> unionAll(Select<R> select) {
+    public final Select<R> unionAll(Select<? extends R> select) {
         return new Union<R>(getConfiguration(), this, select, CombineOperator.UNION_ALL);
     }
 
     @Override
-    public final Select<R> except(Select<R> select) {
+    public final Select<R> except(Select<? extends R> select) {
         return new Union<R>(getConfiguration(), this, select, CombineOperator.EXCEPT);
     }
 
     @Override
-    public final Select<R> intersect(Select<R> select) {
+    public final Select<R> intersect(Select<? extends R> select) {
         return new Union<R>(getConfiguration(), this, select, CombineOperator.INTERSECT);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 18b148078c..42ed297cef 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -579,22 +579,22 @@ class SelectImpl<R extends Record> extends AbstractDelegatingSelect<R> implement
     }
 
     @Override
-    public final SelectImpl<R> union(Select<R> select) {
+    public final SelectImpl<R> union(Select<? extends R> select) {
         return new SelectImpl<R>(getDelegate().union(select));
     }
 
     @Override
-    public final SelectImpl<R> unionAll(Select<R> select) {
+    public final SelectImpl<R> unionAll(Select<? extends R> select) {
         return new SelectImpl<R>(getDelegate().unionAll(select));
     }
 
     @Override
-    public final SelectImpl<R> except(Select<R> select) {
+    public final SelectImpl<R> except(Select<? extends R> select) {
         return new SelectImpl<R>(getDelegate().except(select));
     }
 
     @Override
-    public final SelectImpl<R> intersect(Select<R> select) {
+    public final SelectImpl<R> intersect(Select<? extends R> select) {
         return new SelectImpl<R>(getDelegate().intersect(select));
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java
index 177da30f27..708a0eb034 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java
@@ -378,22 +378,22 @@ class SimpleSelectImpl<R extends Record> extends AbstractDelegatingSelect<R>
     }
 
     @Override
-    public final Select<R> union(Select<R> select) {
+    public final Select<R> union(Select<? extends R> select) {
         return new SimpleSelectImpl<R>(getQuery().union(select));
     }
 
     @Override
-    public final Select<R> unionAll(Select<R> select) {
+    public final Select<R> unionAll(Select<? extends R> select) {
         return new SimpleSelectImpl<R>(getQuery().unionAll(select));
     }
 
     @Override
-    public final Select<R> except(Select<R> select) {
+    public final Select<R> except(Select<? extends R> select) {
         return new SimpleSelectImpl<R>(getQuery().except(select));
     }
 
     @Override
-    public final Select<R> intersect(Select<R> select) {
+    public final Select<R> intersect(Select<? extends R> select) {
         return new SimpleSelectImpl<R>(getQuery().intersect(select));
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Union.java b/jOOQ/src/main/java/org/jooq/impl/Union.java
index a99a59b995..5d41adbd43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Union.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Union.java
@@ -53,16 +53,16 @@ import org.jooq.Select;
  */
 class Union<R extends Record> extends AbstractSelect<R> {
 
-    private static final long     serialVersionUID = 7491446471677986172L;
+    private static final long               serialVersionUID = 7491446471677986172L;
 
-    private final List<Select<R>> queries;
-    private final CombineOperator operator;
+    private final List<Select<? extends R>> queries;
+    private final CombineOperator           operator;
 
-    Union(Configuration configuration, Select<R> query1, Select<R> query2, CombineOperator operator) {
+    Union(Configuration configuration, Select<R> query1, Select<? extends R> query2, CombineOperator operator) {
         super(configuration);
 
         this.operator = operator;
-        this.queries = new ArrayList<Select<R>>();
+        this.queries = new ArrayList<Select<? extends R>>();
         this.queries.add(query1);
         this.queries.add(query2);
     }