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

[jOOQ/jOOQ#17762] EmbeddableTableField::toString should render a ROW style display of the field

Browse Source
This commit is contained in:
Lukas Eder 2024-12-11 11:35:47 +01:00
parent 11ce2ec1cf
commit 2f2a9b76d3
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -5689,7 +5689,7 @@ public class JavaGenerator extends AbstractGenerator {
columnLoop:
for (Definition column : embeddablesAndUnreplacedColumns) {
final String colName = column.getOutputName();
final String colMemberUC = unescapeIdentifier(StringUtils.toUC(getStrategy().getJavaMemberName(column, Mode.DAO), getStrategy().getTargetLocale()));
final String colMemberUC = StringUtils.toUC(unescapeIdentifier(getStrategy().getJavaMemberName(column, Mode.DAO)), getStrategy().getTargetLocale());
final String colTypeFull = getJavaType(column, out, Mode.POJO);
final String colTypeRecord = out.ref(getJavaType(column, out, Mode.RECORD));
final String colType = out.ref(colTypeFull);

25
jOOQ/src/main/java/org/jooq/impl/EmbeddableTableField.java
View File

@ -48,6 +48,8 @@ import org.jooq.EmbeddableRecord;
import org.jooq.Field;
import org.jooq.Name;
import org.jooq.Record;
import org.jooq.RenderContext;
import org.jooq.Row;
import org.jooq.Table;
import org.jooq.TableField;
import org.jooq.impl.QOM.UNotYetImplemented;
@ -97,8 +99,8 @@ implements
// TODO [#12021] [#12706] ROW must consistently follow MULTISET emulation
// [#12237] If a RowField is nested somewhere in MULTISET, we must apply
// the MULTISET emulation as well, here
if (forceMultisetContent(ctx, () -> getDataType().getRow().size() > 1))
acceptMultisetContent(ctx, getDataType().getRow(), this, this::acceptRow);
if (forceMultisetContent(ctx, () -> toRow().size() > 1))
acceptMultisetContent(ctx, toRow(), this, this::acceptRow);
else if (forceRowContent(ctx))
acceptRow(ctx);
else
@ -106,11 +108,15 @@ implements
}
private final void acceptRow(Context<?> ctx) {
ctx.visit(((AbstractRow<?>) getDataType().getRow()).rf());
ctx.visit(toRow().rf());
}
private final AbstractRow<?> toRow() {
return ((AbstractRow<?>) getDataType().getRow());
}
private final void acceptDefault(Context<?> ctx) {
ctx.data(DATA_LIST_ALREADY_INDENTED, true, c -> c.visit(wrap(getDataType().getRow().fields())));
ctx.data(DATA_LIST_ALREADY_INDENTED, true, c -> c.visit(wrap(toRow().fields())));
}
@Override
@ -122,9 +128,18 @@ implements
int projectionSize() {
int result = 0;
for (Field<?> field : ((AbstractRow<?>) getDataType().getRow()).fields.fields)
for (Field<?> field : toRow().fields.fields)
result += ((AbstractField<?>) field).projectionSize();
return result;
}
// -------------------------------------------------------------------------
// The Object API
// -------------------------------------------------------------------------
@Override
String toString0(RenderContext ctx) {
return ctx.visit(toRow()).render();
}
}