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

[jOOQ/jOOQ#12930] Correctly fetch top level nested records of degree 1

Browse Source 
Top level nested records of degree 1 couldn't be fetched under some circumstances, notably when JSONB emulations tried to read ResultSet.getBytes(), but the underlying data wasn't binary compatible (the getString() method would have still worked, masking this bug so far)
This commit is contained in:
Lukas Eder 2022-03-03 14:43:49 +01:00
parent 3835c21c29
commit 4f3c04ec03
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
View File

@ -3789,11 +3789,26 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
return (Record) ctx.input().readObject();
}
@SuppressWarnings({ "unchecked", "rawtypes" })
static final <R extends Record> R readMultiset(BindingGetResultSetContext<?> ctx, DataType<R> type) throws SQLException {
Result<R> result = DefaultResultBinding.readMultiset(ctx, (AbstractRow<R>) type.getRow(), type.getType(),
s -> s != null && (s.startsWith("[") || s.startsWith("{")) ? "[" + s + "]" : s,
s -> s != null && (s.startsWith("<")) ? "<result>" + s + "</result>" : s
);
AbstractRow<R> row = (AbstractRow<R>) type.getRow();
Result<R> result;
// [#12930] AbstractRowAsSubquery doesn't unnecessarily nest Row1
if (row.size() == 1) {
result = new ResultImpl<>(ctx.configuration(), row);
result.add(newRecord(true, (Class<R>) type.getRecordType(), row, ctx.configuration()).operate(r -> {
DefaultBindingGetResultSetContext<?> c = new DefaultBindingGetResultSetContext<>(ctx.executeContext(), ctx.resultSet(), ctx.index());
r.field(0).getBinding().get((BindingGetResultSetContext) c);
r.fromArray(c.value());
return r;
}));
}
else
result = DefaultResultBinding.readMultiset(ctx, row, type.getType(),
s -> s != null && (s.startsWith("[") || s.startsWith("{")) ? "[" + s + "]" : s,
s -> s != null && (s.startsWith("<")) ? "<result>" + s + "</result>" : s
);
return isEmpty(result) ? null : result.get(0);
}