1.1 --- a/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Mar 05 21:22:33 2019 +0100
     1.2 +++ b/java/sql-dk/src/main/java/info/globalcode/sql/dk/formatting/XmlFormatter.java	Tue Mar 05 22:03:02 2019 +0100
     1.3 @@ -184,8 +184,11 @@
     1.4  	}
     1.5  
     1.6  	private String getCurrentRelationName() {
     1.7 -		// TODO: support custom names (add CLI option)
     1.8 -		return "r" + resultSetCounter;
     1.9 +		if (getFormatterContext().getRelationNames() == null || getFormatterContext().getRelationNames().size() < resultSetCounter) {
    1.10 +			return "r" + resultSetCounter;
    1.11 +		} else {
    1.12 +			return getFormatterContext().getRelationNames().get(resultSetCounter - 1);
    1.13 +		}
    1.14  	}
    1.15  
    1.16  	@Override