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

[jOOQ/jOOQ#18144] MULTISET emulation using XML doesn't correctly encode

Browse Source 
NULL String values when nesting tables as SelectField
This commit is contained in:
Lukas Eder 2025-03-12 16:59:13 +01:00
parent 6e0d1c7807
commit 443c09a4f1
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jOOQ/src/main/java/org/jooq/impl/AbstractRowAsField.java
View File

@ -45,6 +45,7 @@ import static org.jooq.impl.DSL.jsonbObject;
import static org.jooq.impl.DSL.select;
import static org.jooq.impl.DSL.xmlelement;
import static org.jooq.impl.Multiset.returningClob;
import static org.jooq.impl.Multiset.wrapXmlelement;
import static org.jooq.impl.Names.N_RECORD;
import static org.jooq.impl.RowAsField.NO_NATIVE_SUPPORT;
import static org.jooq.impl.Tools.emulateMultiset;
@ -218,8 +219,8 @@ implements
default:
ctx.visit(alias(ctx, alias, xmlelement(N_RECORD,
map(row.fields(), (f, i) -> xmlelement(fieldNameString(i), f)))
));
map(row.fields(), (f, i) -> wrapXmlelement(ctx, f, fieldNameString(i)))
)));
break;
}

20
jOOQ/src/main/java/org/jooq/impl/Multiset.java
View File

@ -653,19 +653,23 @@ final class Multiset<R extends Record> extends AbstractField<Result<R>> implemen
map(fields.fields(), (f, i) -> {
Field<?> v = castForXML(ctx, agg ? f : DSL.field(fieldName(i), f.getDataType()));
String n = fieldNameString(i);
DataType<?> t = v.getDataType();
// [#13181] We must make the '' vs NULL distinction explicit in XML
// [#13872] Same with ARRAY[] vs NULL
if (t.isString() || t.isArray())
return xmlelement(n, xmlattributes(when(v.isNull(), inline("true")).as(xsiNil(ctx))), v);
else
return xmlelement(n, v);
return wrapXmlelement(ctx, v, n);
})
)
);
}
static final Field<XML> wrapXmlelement(Context<?> ctx, Field<?> v, String n) {
DataType<?> t = v.getDataType();
// [#13181] We must make the '' vs NULL distinction explicit in XML
// [#13872] Same with ARRAY[] vs NULL
if (t.isString() || t.isArray())
return xmlelement(n, xmlattributes(when(v.isNull(), inline("true")).as(xsiNil(ctx))), v);
else
return xmlelement(n, v);
}
static final ArrayAggOrderByStep<?> arrayAggEmulation(Fields fields, boolean agg) {
return arrayAgg(
new RowAsField<>(row(