1.1 --- a/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java Mon Apr 29 01:27:26 2019 +0200
1.2 +++ b/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java Tue Apr 30 19:49:17 2019 +0200
1.3 @@ -85,7 +85,7 @@
1.4
1.5 private String currentDatabaseName;
1.6 private int statementCounter;
1.7 - private int resultSetCounter;
1.8 +
1.9
1.10 public XmlFormatter(FormatterContext formatterContext) {
1.11 super(formatterContext);
1.12 @@ -109,7 +109,6 @@
1.13 attributes.put(new QName(null, XML_NS_PREFIX_SQLDK, "xmlns"), Xmlns.SQLDK);
1.14 printStartElement(qname("relpipe"), attributes);
1.15 statementCounter = 0;
1.16 - resultSetCounter = 0;
1.17
1.18 }
1.19
1.20 @@ -183,18 +182,9 @@
1.21
1.22 }
1.23
1.24 - private String getCurrentRelationName() {
1.25 - if (getFormatterContext().getRelationNames() == null || getFormatterContext().getRelationNames().size() < resultSetCounter) {
1.26 - return "r" + resultSetCounter;
1.27 - } else {
1.28 - return getFormatterContext().getRelationNames().get(resultSetCounter - 1);
1.29 - }
1.30 - }
1.31 -
1.32 @Override
1.33 public void writeStartResultSet(ColumnsHeader header) {
1.34 super.writeStartResultSet(header);
1.35 - resultSetCounter++;
1.36 printStartElement(qname(XML_ELEMENT_RELATION), singleAttribute(qnameDK(XML_ATTRIBUTE_STATEMENT), getCurrentStatementName()));
1.37 printTextElement(qname(XML_ELEMENT_NAME), null, getCurrentRelationName());
1.38