diff -r 3380ae5275be -r 7f81cfa150d0 java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java --- a/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java Mon Apr 29 01:27:26 2019 +0200 +++ b/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java Tue Apr 30 19:49:17 2019 +0200 @@ -85,7 +85,7 @@ private String currentDatabaseName; private int statementCounter; - private int resultSetCounter; + public XmlFormatter(FormatterContext formatterContext) { super(formatterContext); @@ -109,7 +109,6 @@ attributes.put(new QName(null, XML_NS_PREFIX_SQLDK, "xmlns"), Xmlns.SQLDK); printStartElement(qname("relpipe"), attributes); statementCounter = 0; - resultSetCounter = 0; } @@ -183,18 +182,9 @@ } - private String getCurrentRelationName() { - if (getFormatterContext().getRelationNames() == null || getFormatterContext().getRelationNames().size() < resultSetCounter) { - return "r" + resultSetCounter; - } else { - return getFormatterContext().getRelationNames().get(resultSetCounter - 1); - } - } - @Override public void writeStartResultSet(ColumnsHeader header) { super.writeStartResultSet(header); - resultSetCounter++; printStartElement(qname(XML_ELEMENT_RELATION), singleAttribute(qnameDK(XML_ATTRIBUTE_STATEMENT), getCurrentStatementName())); printTextElement(qname(XML_ELEMENT_NAME), null, getCurrentRelationName());