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

[#2049] Add gt() / ge() / lt() / le() to Row[N] types - Renamed newly

Browse Source 
factored out conditions
This commit is contained in:
Lukas Eder 2012-12-24 10:27:54 +01:00
parent 20aa6e512a
commit acf270d1f5
6 changed files with 160 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
jOOQ-tools/src/org/jooq/xtend/Rows.xtend
View File

@ -983,19 +983,19 @@ class Rows extends Generators {
@Override
public final Condition equal(Row«degree»<«TN(degree)»> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
«ENDFOR»
@Override
public final Condition equal(RowN row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
«FOR degree : (1..Constants::MAX_ROW_DEGREE)»
@Override
public final Condition equal(Record«degree»<«TN(degree)»> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
«ENDFOR»
@ -1003,7 +1003,7 @@ class Rows extends Generators {
public final Condition equal(Record record) {
List<Field<?>> f = record.getFields();
Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
«FOR degree : (1..Constants::MAX_ROW_DEGREE)»
@ -1081,19 +1081,19 @@ class Rows extends Generators {
@Override
public final Condition notEqual(Row«degree»<«TN(degree)»> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
«ENDFOR»
@Override
public final Condition notEqual(RowN row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
«FOR degree : (1..Constants::MAX_ROW_DEGREE)»
@Override
public final Condition notEqual(Record«degree»<«TN(degree)»> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
«ENDFOR»
@ -1101,7 +1101,7 @@ class Rows extends Generators {
public final Condition notEqual(Record record) {
List<Field<?>> f = record.getFields();
Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
«FOR degree : (1..Constants::MAX_ROW_DEGREE)»
@ -1183,19 +1183,19 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition lessThan(Row«degree»<«TN(degree)»> row) {
««« return new RowCompare(this, row, Comparator.LESS);
««« return new RowCondition(this, row, Comparator.LESS);
««« }
««« «ENDFOR»
«««
««« @Override
««« public final Condition lessThan(RowN row) {
««« return new RowCompare(this, row, Comparator.LESS);
««« return new RowCondition(this, row, Comparator.LESS);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
««« @Override
««« public final Condition lessThan(Record«degree»<«TN(degree)»> record) {
««« return new RowCompare(this, record.valuesRow(), Comparator.LESS);
««« return new RowCondition(this, record.valuesRow(), Comparator.LESS);
««« }
««« «ENDFOR»
«««
@ -1203,7 +1203,7 @@ class Rows extends Generators {
««« public final Condition lessThan(Record record) {
««« List<Field<?>> f = record.getFields();
««« Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
««« return new RowCompare(this, row, Comparator.LESS);
««« return new RowCondition(this, row, Comparator.LESS);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
@ -1281,19 +1281,19 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition lessOrEqual(Row«degree»<«TN(degree)»> row) {
««« return new RowCompare(this, row, Comparator.LESS_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.LESS_OR_EQUAL);
««« }
««« «ENDFOR»
«««
««« @Override
««« public final Condition lessOrEqual(RowN row) {
««« return new RowCompare(this, row, Comparator.LESS_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.LESS_OR_EQUAL);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
««« @Override
««« public final Condition lessOrEqual(Record«degree»<«TN(degree)»> record) {
««« return new RowCompare(this, record.valuesRow(), Comparator.LESS_OR_EQUAL);
««« return new RowCondition(this, record.valuesRow(), Comparator.LESS_OR_EQUAL);
««« }
««« «ENDFOR»
«««
@ -1301,7 +1301,7 @@ class Rows extends Generators {
««« public final Condition lessOrEqual(Record record) {
««« List<Field<?>> f = record.getFields();
««« Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
««« return new RowCompare(this, row, Comparator.LESS_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.LESS_OR_EQUAL);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
@ -1379,19 +1379,19 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition greaterThan(Row«degree»<«TN(degree)»> row) {
««« return new RowCompare(this, row, Comparator.GREATER);
««« return new RowCondition(this, row, Comparator.GREATER);
««« }
««« «ENDFOR»
«««
««« @Override
««« public final Condition greaterThan(RowN row) {
««« return new RowCompare(this, row, Comparator.GREATER);
««« return new RowCondition(this, row, Comparator.GREATER);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
««« @Override
««« public final Condition greaterThan(Record«degree»<«TN(degree)»> record) {
««« return new RowCompare(this, record.valuesRow(), Comparator.GREATER);
««« return new RowCondition(this, record.valuesRow(), Comparator.GREATER);
««« }
««« «ENDFOR»
«««
@ -1399,7 +1399,7 @@ class Rows extends Generators {
««« public final Condition greaterThan(Record record) {
««« List<Field<?>> f = record.getFields();
««« Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
««« return new RowCompare(this, row, Comparator.GREATER);
««« return new RowCondition(this, row, Comparator.GREATER);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
@ -1477,19 +1477,19 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition greaterOrEqual(Row«degree»<«TN(degree)»> row) {
««« return new RowCompare(this, row, Comparator.GREATER_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.GREATER_OR_EQUAL);
««« }
««« «ENDFOR»
«««
««« @Override
««« public final Condition greaterOrEqual(RowN row) {
««« return new RowCompare(this, row, Comparator.GREATER_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.GREATER_OR_EQUAL);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
««« @Override
««« public final Condition greaterOrEqual(Record«degree»<«TN(degree)»> record) {
««« return new RowCompare(this, record.valuesRow(), Comparator.GREATER_OR_EQUAL);
««« return new RowCondition(this, record.valuesRow(), Comparator.GREATER_OR_EQUAL);
««« }
««« «ENDFOR»
«««
@ -1497,7 +1497,7 @@ class Rows extends Generators {
««« public final Condition greaterOrEqual(Record record) {
««« List<Field<?>> f = record.getFields();
««« Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
««« return new RowCompare(this, row, Comparator.GREATER_OR_EQUAL);
««« return new RowCondition(this, row, Comparator.GREATER_OR_EQUAL);
««« }
««« «FOR degree : (1..Constants::MAX_ROW_DEGREE)»
«««
@ -1657,13 +1657,13 @@ class Rows extends Generators {
@Override
public final Condition in(Collection rows) {
QueryPartList<Row> list = new QueryPartList<Row>(rows);
return new RowIn(this, list, SubqueryOperator.IN);
return new RowInCondition(this, list, SubqueryOperator.IN);
}
@Override
public final Condition notIn(Collection rows) {
QueryPartList<Row> list = new QueryPartList<Row>(rows);
return new RowIn(this, list, SubqueryOperator.NOT_IN);
return new RowInCondition(this, list, SubqueryOperator.NOT_IN);
}
// ------------------------------------------------------------------------
@ -1672,7 +1672,7 @@ class Rows extends Generators {
@Override
public final Condition equal(Select select) {
return new RowSubquery(this, select, SubqueryOperator.EQUALS);
return new RowSubqueryCondition(this, select, SubqueryOperator.EQUALS);
}
@Override
@ -1682,7 +1682,7 @@ class Rows extends Generators {
@Override
public final Condition notEqual(Select select) {
return new RowSubquery(this, select, SubqueryOperator.NOT_EQUALS);
return new RowSubqueryCondition(this, select, SubqueryOperator.NOT_EQUALS);
}
@Override
@ -1692,7 +1692,7 @@ class Rows extends Generators {
««« @Override
««« public final Condition greaterThan(Select select) {
««« return new RowSubquery(this, select, SubqueryOperator.GREATER);
««« return new RowSubqueryCondition(this, select, SubqueryOperator.GREATER);
««« }
«««
««« @Override
@ -1702,7 +1702,7 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition greaterOrEqual(Select select) {
««« return new RowSubquery(this, select, SubqueryOperator.GREATER_OR_EQUAL);
««« return new RowSubqueryCondition(this, select, SubqueryOperator.GREATER_OR_EQUAL);
««« }
«««
««« @Override
@ -1712,7 +1712,7 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition lessThan(Select select) {
««« return new RowSubquery(this, select, SubqueryOperator.LESS);
««« return new RowSubqueryCondition(this, select, SubqueryOperator.LESS);
««« }
«««
««« @Override
@ -1722,7 +1722,7 @@ class Rows extends Generators {
«««
««« @Override
««« public final Condition lessOrEqual(Select select) {
««« return new RowSubquery(this, select, SubqueryOperator.LESS_OR_EQUAL);
««« return new RowSubqueryCondition(this, select, SubqueryOperator.LESS_OR_EQUAL);
««« }
«««
««« @Override
@ -1732,12 +1732,12 @@ class Rows extends Generators {
«««
@Override
public final Condition in(Select select) {
return new RowSubquery(this, select, SubqueryOperator.IN);
return new RowSubqueryCondition(this, select, SubqueryOperator.IN);
}
@Override
public final Condition notIn(Select select) {
return new RowSubquery(this, select, SubqueryOperator.NOT_IN);
return new RowSubqueryCondition(this, select, SubqueryOperator.NOT_IN);
}
// ------------------------------------------------------------------------
@ -1756,7 +1756,7 @@ class Rows extends Generators {
@Override
public final Condition overlaps(Row2<T1, T2> row) {
return new RowOverlaps(this, row);
return new RowOverlapsCondition(this, row);
}
}
''');

4
jOOQ/src/main/java/org/jooq/impl/RowCompare.java → jOOQ/src/main/java/org/jooq/impl/RowCondition.java
View File

@ -64,7 +64,7 @@ import org.jooq.Row;
* @author Lukas Eder
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
class RowCompare extends AbstractCondition {
class RowCondition extends AbstractCondition {
/**
* Generated UID
@ -75,7 +75,7 @@ class RowCompare extends AbstractCondition {
private final Row right;
private final Comparator comparator;
RowCompare(Row left, Row right, Comparator comparator) {
RowCondition(Row left, Row right, Comparator comparator) {
this.left = left;
this.right = right;
this.comparator = comparator;

232
jOOQ/src/main/java/org/jooq/impl/RowImpl.java
View File

@ -50,6 +50,14 @@ import org.jooq.Condition;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.Record1;
import org.jooq.Record2;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.Record7;
import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.Record10;
import org.jooq.Record11;
import org.jooq.Record12;
@ -60,20 +68,20 @@ import org.jooq.Record16;
import org.jooq.Record17;
import org.jooq.Record18;
import org.jooq.Record19;
import org.jooq.Record2;
import org.jooq.Record20;
import org.jooq.Record21;
import org.jooq.Record22;
import org.jooq.Record3;
import org.jooq.Record4;
import org.jooq.Record5;
import org.jooq.Record6;
import org.jooq.Record7;
import org.jooq.Record8;
import org.jooq.Record9;
import org.jooq.RenderContext;
import org.jooq.Row;
import org.jooq.Row1;
import org.jooq.Row2;
import org.jooq.Row3;
import org.jooq.Row4;
import org.jooq.Row5;
import org.jooq.Row6;
import org.jooq.Row7;
import org.jooq.Row8;
import org.jooq.Row9;
import org.jooq.Row10;
import org.jooq.Row11;
import org.jooq.Row12;
@ -84,17 +92,9 @@ import org.jooq.Row16;
import org.jooq.Row17;
import org.jooq.Row18;
import org.jooq.Row19;
import org.jooq.Row2;
import org.jooq.Row20;
import org.jooq.Row21;
import org.jooq.Row22;
import org.jooq.Row3;
import org.jooq.Row4;
import org.jooq.Row5;
import org.jooq.Row6;
import org.jooq.Row7;
import org.jooq.Row8;
import org.jooq.Row9;
import org.jooq.RowN;
import org.jooq.Select;
@ -310,234 +310,234 @@ implements
@Override
public final Condition equal(Row1<T1> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row2<T1, T2> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row3<T1, T2, T3> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row4<T1, T2, T3, T4> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row5<T1, T2, T3, T4, T5> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row6<T1, T2, T3, T4, T5, T6> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row7<T1, T2, T3, T4, T5, T6, T7> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row8<T1, T2, T3, T4, T5, T6, T7, T8> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(RowN row) {
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
public final Condition equal(Record1<T1> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record2<T1, T2> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record3<T1, T2, T3> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record4<T1, T2, T3, T4> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record5<T1, T2, T3, T4, T5> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record6<T1, T2, T3, T4, T5, T6> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record7<T1, T2, T3, T4, T5, T6, T7> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record8<T1, T2, T3, T4, T5, T6, T7, T8> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> record) {
return new RowCompare(this, record.valuesRow(), Comparator.EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.EQUALS);
}
@Override
public final Condition equal(Record record) {
List<Field<?>> f = record.getFields();
Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
return new RowCompare(this, row, Comparator.EQUALS);
return new RowCondition(this, row, Comparator.EQUALS);
}
@Override
@ -1232,234 +1232,234 @@ implements
@Override
public final Condition notEqual(Row1<T1> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row2<T1, T2> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row3<T1, T2, T3> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row4<T1, T2, T3, T4> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row5<T1, T2, T3, T4, T5> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row6<T1, T2, T3, T4, T5, T6> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row7<T1, T2, T3, T4, T5, T6, T7> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row8<T1, T2, T3, T4, T5, T6, T7, T8> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(RowN row) {
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record1<T1> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record2<T1, T2> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record3<T1, T2, T3> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record4<T1, T2, T3, T4> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record5<T1, T2, T3, T4, T5> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record6<T1, T2, T3, T4, T5, T6> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record7<T1, T2, T3, T4, T5, T6, T7> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record8<T1, T2, T3, T4, T5, T6, T7, T8> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> record) {
return new RowCompare(this, record.valuesRow(), Comparator.NOT_EQUALS);
return new RowCondition(this, record.valuesRow(), Comparator.NOT_EQUALS);
}
@Override
public final Condition notEqual(Record record) {
List<Field<?>> f = record.getFields();
Row row = new RowImpl(vals(record.intoArray(), f.toArray(new Field[f.size()])));
return new RowCompare(this, row, Comparator.NOT_EQUALS);
return new RowCondition(this, row, Comparator.NOT_EQUALS);
}
@Override
@ -2905,22 +2905,22 @@ implements
@Override
public final Condition in(Collection rows) {
QueryPartList<Row> list = new QueryPartList<Row>(rows);
return new RowIn(this, list, SubqueryOperator.IN);
return new RowInCondition(this, list, SubqueryOperator.IN);
}
@Override
public final Condition notIn(Collection rows) {
QueryPartList<Row> list = new QueryPartList<Row>(rows);
return new RowIn(this, list, SubqueryOperator.NOT_IN);
return new RowInCondition(this, list, SubqueryOperator.NOT_IN);
}
// ------------------------------------------------------------------------
// Predicates involving subqueries
// ------------------------------------------------------------------------
@Override
public final Condition equal(Select select) {
return new RowSubquery(this, select, SubqueryOperator.EQUALS);
return new RowSubqueryCondition(this, select, SubqueryOperator.EQUALS);
}
@Override
@ -2930,7 +2930,7 @@ implements
@Override
public final Condition notEqual(Select select) {
return new RowSubquery(this, select, SubqueryOperator.NOT_EQUALS);
return new RowSubqueryCondition(this, select, SubqueryOperator.NOT_EQUALS);
}
@Override
@ -2940,12 +2940,12 @@ implements
@Override
public final Condition in(Select select) {
return new RowSubquery(this, select, SubqueryOperator.IN);
return new RowSubqueryCondition(this, select, SubqueryOperator.IN);
}
@Override
public final Condition notIn(Select select) {
return new RowSubquery(this, select, SubqueryOperator.NOT_IN);
return new RowSubqueryCondition(this, select, SubqueryOperator.NOT_IN);
}
// ------------------------------------------------------------------------
@ -2964,6 +2964,6 @@ implements
@Override
public final Condition overlaps(Row2<T1, T2> row) {
return new RowOverlaps(this, row);
return new RowOverlapsCondition(this, row);
}
}

6
jOOQ/src/main/java/org/jooq/impl/RowIn.java → jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
View File

@ -62,7 +62,7 @@ import org.jooq.Row;
/**
* @author Lukas Eder
*/
class RowIn extends AbstractCondition {
class RowInCondition extends AbstractCondition {
/**
* Generated UID
@ -73,7 +73,7 @@ class RowIn extends AbstractCondition {
private final QueryPartList<? extends Row> right;
private final SubqueryOperator operator;
RowIn(Row left, QueryPartList<? extends Row> right, SubqueryOperator operator) {
RowInCondition(Row left, QueryPartList<? extends Row> right, SubqueryOperator operator) {
this.left = left;
this.right = right;
this.operator = operator;
@ -94,7 +94,7 @@ class RowIn extends AbstractCondition {
List<Condition> conditions = new ArrayList<Condition>();
for (Row row : right) {
conditions.add(new RowCompare(left, row, EQUALS));
conditions.add(new RowCondition(left, row, EQUALS));
}
Condition result = new CombinedCondition(Operator.OR, conditions);

4
jOOQ/src/main/java/org/jooq/impl/RowOverlaps.java → jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
View File

@ -60,7 +60,7 @@ import org.jooq.Row2;
/**
* @author Lukas Eder
*/
class RowOverlaps<T1, T2> extends AbstractCondition {
class RowOverlapsCondition<T1, T2> extends AbstractCondition {
/**
* Generated UID
@ -70,7 +70,7 @@ class RowOverlaps<T1, T2> extends AbstractCondition {
private final Row2<T1, T2> left;
private final Row2<T1, T2> right;
RowOverlaps(Row2<T1, T2> left, Row2<T1, T2> right) {
RowOverlapsCondition(Row2<T1, T2> left, Row2<T1, T2> right) {
this.left = left;
this.right = right;
}

4
jOOQ/src/main/java/org/jooq/impl/RowSubquery.java → jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
View File

@ -46,7 +46,7 @@ import org.jooq.Select;
/**
* @author Lukas Eder
*/
class RowSubquery extends AbstractCondition {
class RowSubqueryCondition extends AbstractCondition {
/**
* Generated UID
@ -57,7 +57,7 @@ class RowSubquery extends AbstractCondition {
private final Select<?> right;
private final SubqueryOperator operator;
RowSubquery(Row left, Select<?> right, SubqueryOperator operator) {
RowSubqueryCondition(Row left, Select<?> right, SubqueryOperator operator) {
this.left = left;
this.right = right;
this.operator = operator;