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

[jOOQ/jOOQ#16279] Result::formatXML should omit type attribute on

Browse Source 
columns whose type is unknown
This commit is contained in:
Lukas Eder 2024-02-13 11:38:25 +01:00
parent 1a6518c0d9
commit 3de0c3fdc2
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jOOQ/src/main/java/org/jooq/impl/AbstractResult.java
View File

@ -530,17 +530,20 @@ abstract class AbstractResult<R extends Record> extends AbstractFormattable impl
writer.append(' ');
JSONValue.writeJSONString(field.getName(), writer);
writer.append(',');
if (format.format())
writer.append(format.newline()).append(format.indentString(3));
if (!field.getDataType().getQualifiedName().empty()) {
writer.append(',');
writer.append("\"type\":");
if (format.format())
writer.append(format.newline()).append(format.indentString(3));
if (format.format())
writer.append(' ');
writer.append("\"type\":");
JSONValue.writeJSONString(formatTypeName(field), writer);
if (format.format())
writer.append(' ');
JSONValue.writeJSONString(formatTypeName(field), writer);
}
if (format.format())
writer.append(format.newline()).append(format.indentString(2));
@ -819,9 +822,14 @@ abstract class AbstractResult<R extends Record> extends AbstractFormattable impl
writer.append(" name=\"");
writer.append(escapeXML(field.getName()));
writer.append("\"");
writer.append(" type=\"");
writer.append(escapeXML(formatTypeName(field)));
writer.append("\"/>");
if (!field.getDataType().getQualifiedName().empty()) {
writer.append(" type=\"");
writer.append(escapeXML(formatTypeName(field)));
writer.append("\"");
}
writer.append("/>");
}
writer.append(newline).append(format.indentString(1)).append("</fields>");
@ -1205,7 +1213,10 @@ abstract class AbstractResult<R extends Record> extends AbstractFormattable impl
}
eField.setAttribute("name", field.getName());
eField.setAttribute("type", formatTypeName(field));
if (!field.getDataType().getQualifiedName().empty())
eField.setAttribute("type", formatTypeName(field));
eFields.appendChild(eField);
}
@ -1334,7 +1345,9 @@ abstract class AbstractResult<R extends Record> extends AbstractFormattable impl
}
attrs.addAttribute("", "", "name", "CDATA", field.getName());
attrs.addAttribute("", "", "type", "CDATA", formatTypeName(field));
if (!field.getDataType().getQualifiedName().empty())
attrs.addAttribute("", "", "type", "CDATA", formatTypeName(field));
handler.startElement("", "", "field", attrs);
handler.endElement("", "", "field");