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

[jOOQ/jOOQ#16114] Settings.returnDefaultOnUpdatableRecord and

Browse Source 
Settings.returnComputedOnUpdatableRecord don't work for replacing
embeddables
This commit is contained in:
Lukas Eder 2024-01-26 12:35:36 +01:00
parent c92933b855
commit 59fe044378
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jOOQ/src/main/java/org/jooq/impl/TableRecordImpl.java
View File

@ -58,6 +58,7 @@ import static org.jooq.conf.WriteIfReadonly.WRITE;
import static org.jooq.impl.RecordDelegate.delegate;
import static org.jooq.impl.RecordDelegate.RecordLifecycleType.INSERT;
import static org.jooq.impl.Tools.EMPTY_FIELD;
import static org.jooq.impl.Tools.anyMatch;
import static org.jooq.impl.Tools.collect;
import static org.jooq.impl.Tools.filter;
import static org.jooq.impl.Tools.indexOrFail;
@ -74,6 +75,7 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import org.jooq.Configuration;
import org.jooq.DSLContext;
@ -457,14 +459,19 @@ public class TableRecordImpl<R extends TableRecord<R>> extends AbstractQualified
// [#14573] Return also non-key columns
if (TRUE.equals(s.isReturnDefaultOnUpdatableRecord()))
for (Field<?> f : fields())
if (f.getDataType().defaulted())
if (isType(f, DataType::defaulted))
result.add(f);
if (TRUE.equals(s.isReturnComputedOnUpdatableRecord()))
for (Field<?> f : fields())
if (f.getDataType().computed())
if (isType(f, DataType::computed))
result.add(f);
return result;
}
private static final boolean isType(Field<?> f, Predicate<? super DataType<?>> predicate) {
DataType<?> t = f.getDataType();
return predicate.test(t) || t.isEmbeddable() && anyMatch(t.getRow().fields(), x -> predicate.test(x.getDataType()));
}
}