github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2031] Change union(Select<R>) and similar methods to union(Select<?

Browse Source 
extends R>)
This commit is contained in:
Lukas Eder 2012-12-20 15:05:03 +01:00
parent 3ac1764ea5
commit 09b379103f
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ/src/main/java/org/jooq/Select.java
View File

@ -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

8
jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
View File

@ -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);
}

8
jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
View File

@ -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));
}

8
jOOQ/src/main/java/org/jooq/impl/SimpleSelectImpl.java
View File

@ -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));
}
}

10
jOOQ/src/main/java/org/jooq/impl/Union.java
View File

@ -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);
}