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

[#2591] Result.intoGroups() and similar methods create key Records with

Browse Source 
changed=true
This commit is contained in:
Lukas Eder 2013-08-19 14:31:32 +02:00
parent 09eb2de5f0
commit 2eb4fcd8f2
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
View File

@ -67,9 +67,9 @@ import org.jooq.Field;
import org.jooq.Record;
import org.jooq.RecordHandler;
import org.jooq.RecordMapper;
import org.jooq.RecordType;
import org.jooq.Result;
import org.jooq.Row;
import org.jooq.RecordType;
import org.jooq.Table;
import org.jooq.exception.InvalidResultException;
import org.jooq.tools.Convert;
@ -800,10 +800,10 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
for (R record : this) {
@SuppressWarnings({ "rawtypes", "unchecked" })
Record key = new RecordImpl(keys);
RecordImpl key = new RecordImpl(keys);
for (Field<?> field : keys) {
Utils.setValue(key, field, record, field);
Utils.copyValue(key, field, record, field);
}
if (map.put(key, record) != null) {
@ -909,10 +909,10 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
for (R record : this) {
@SuppressWarnings({ "rawtypes", "unchecked" })
Record key = new RecordImpl(keys);
RecordImpl key = new RecordImpl(keys);
for (Field<?> field : keys) {
Utils.setValue(key, field, record, field);
Utils.copyValue(key, field, record, field);
}
Result<R> result = map.get(key);
@ -961,10 +961,10 @@ class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
for (R record : this) {
@SuppressWarnings({ "rawtypes", "unchecked" })
Record key = new RecordImpl(keys);
RecordImpl key = new RecordImpl(keys);
for (Field<?> field : keys) {
Utils.setValue(key, field, record, field);
Utils.copyValue(key, field, record, field);
}
List<E> list = map.get(key);

13
jOOQ/src/main/java/org/jooq/impl/Utils.java
View File

@ -1171,6 +1171,19 @@ final class Utils {
target.setValue(targetField, targetField.getDataType().convert(value));
}
/**
* [#2591] Type-safely copy a value from one record to another, preserving flags.
*/
static final <T> void copyValue(AbstractRecord target, Field<T> targetField, Record source, Field<?> sourceField) {
Value<T> value = new Value<T>(
targetField.getDataType().convert(source.getValue(sourceField)),
targetField.getDataType().convert(source.original(sourceField)),
source.changed(sourceField)
);
target.setValue(targetField, value);
}
/**
* Map a {@link Schema} according to the configured {@link org.jooq.SchemaMapping}
*/

7
jOOQ/src/main/java/org/jooq/impl/Value.java
View File

@ -51,8 +51,13 @@ class Value<T> implements Serializable {
private boolean isChanged;
Value(T value) {
this.original = value;
this(value, value, false);
}
Value(T value, T original, boolean isChanged) {
this.value = value;
this.original = original;
this.isChanged = isChanged;
}
final T getValue() {