1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java	Fri Dec 20 22:19:10 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java	Fri Dec 20 22:58:02 2013 +0100
     1.3 @@ -18,7 +18,6 @@
     1.4  package info.globalcode.sql.dk.formatting;
     1.5  
     1.6  import info.globalcode.sql.dk.Parameter;
     1.7 -import java.io.OutputStream;
     1.8  import java.util.EmptyStackException;
     1.9  import java.util.EnumSet;
    1.10  import java.util.List;
    1.11 @@ -31,13 +30,13 @@
    1.12  public abstract class AbstractFormatter implements Formatter {
    1.13  
    1.14  	private Stack<State> state = new Stack<>();
    1.15 -	private OutputStream outputStream;
    1.16 +	private FormatterContext formatterContext;
    1.17  	private ColumnsHeader currentColumnsHeader;
    1.18  	private String currentQuery;
    1.19  	private int currentColumnsCount;
    1.20  
    1.21 -	public AbstractFormatter(OutputStream outputStream) {
    1.22 -		this.outputStream = outputStream;
    1.23 +	public AbstractFormatter(FormatterContext formatterContext) {
    1.24 +		this.formatterContext = formatterContext;
    1.25  		state.push(State.ROOT);
    1.26  	}
    1.27  
    1.28 @@ -224,8 +223,8 @@
    1.29  		popState(EnumSet.of(State.UPDATES_RESULT));
    1.30  	}
    1.31  
    1.32 -	protected OutputStream getOutputStream() {
    1.33 -		return outputStream;
    1.34 +	public FormatterContext getFormatterContext() {
    1.35 +		return formatterContext;
    1.36  	}
    1.37  
    1.38  	protected ColumnsHeader getCurrentColumnsHeader() {