1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularPrefetchingFormatter.java	Tue Jan 07 21:53:24 2014 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularPrefetchingFormatter.java	Tue Jan 07 21:54:59 2014 +0100
     1.3 @@ -17,7 +17,6 @@
     1.4   */
     1.5  package info.globalcode.sql.dk.formatting;
     1.6  
     1.7 -import info.globalcode.sql.dk.Parameter;
     1.8  import java.util.ArrayList;
     1.9  import java.util.List;
    1.10  
    1.11 @@ -32,8 +31,6 @@
    1.12  public class TabularPrefetchingFormatter extends TabularFormatter {
    1.13  
    1.14  	public static final String NAME = "tabular-prefetching"; // bash-completion:formatter
    1.15 -	private String currentSql;
    1.16 -	private List<? extends Parameter> currentParameters;
    1.17  	private ColumnsHeader currentHeader;
    1.18  	private List<Object[]> currentResultSet;
    1.19  	private Object[] currentRow;
    1.20 @@ -54,22 +51,8 @@
    1.21  	}
    1.22  
    1.23  	@Override
    1.24 -	public void writeStartResultSet() {
    1.25 +	public void writeStartResultSet(ColumnsHeader header) {
    1.26  		currentResultSet = new ArrayList<>();
    1.27 -	}
    1.28 -
    1.29 -	@Override
    1.30 -	public void writeQuery(String sql) {
    1.31 -		currentSql = sql;
    1.32 -	}
    1.33 -
    1.34 -	@Override
    1.35 -	public void writeParameters(List<? extends Parameter> parameters) {
    1.36 -		currentParameters = parameters;
    1.37 -	}
    1.38 -
    1.39 -	@Override
    1.40 -	public void writeColumnsHeader(ColumnsHeader header) {
    1.41  		currentHeader = header;
    1.42  		initColumnWidths(header.getColumnCount());
    1.43  	}
    1.44 @@ -99,10 +82,7 @@
    1.45  	public void writeEndResultSet() {
    1.46  		prefetchDone = true;
    1.47  
    1.48 -		super.writeStartResultSet();
    1.49 -		super.writeQuery(currentSql);
    1.50 -		super.writeParameters(currentParameters);
    1.51 -		super.writeColumnsHeader(currentHeader);
    1.52 +		super.writeStartResultSet(currentHeader);
    1.53  
    1.54  		for (Object[] row : currentResultSet) {
    1.55  			super.writeStartRow();
    1.56 @@ -113,8 +93,6 @@
    1.57  		}
    1.58  
    1.59  		currentColumnsCount = 0;
    1.60 -		currentSql = null;
    1.61 -		currentParameters = null;
    1.62  		currentHeader = null;
    1.63  		currentRow = null;
    1.64  		currentResultSet = null;