--- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularPrefetchingFormatter.java	Tue Jan 07 21:53:24 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/TabularPrefetchingFormatter.java	Tue Jan 07 21:54:59 2014 +0100
@@ -17,7 +17,6 @@
  */
 package info.globalcode.sql.dk.formatting;
 
-import info.globalcode.sql.dk.Parameter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +31,6 @@
 public class TabularPrefetchingFormatter extends TabularFormatter {
 
 	public static final String NAME = "tabular-prefetching"; // bash-completion:formatter
-	private String currentSql;
-	private List<? extends Parameter> currentParameters;
 	private ColumnsHeader currentHeader;
 	private List<Object[]> currentResultSet;
 	private Object[] currentRow;
@@ -54,22 +51,8 @@
 	}
 
 	@Override
-	public void writeStartResultSet() {
+	public void writeStartResultSet(ColumnsHeader header) {
 		currentResultSet = new ArrayList<>();
-	}
-
-	@Override
-	public void writeQuery(String sql) {
-		currentSql = sql;
-	}
-
-	@Override
-	public void writeParameters(List<? extends Parameter> parameters) {
-		currentParameters = parameters;
-	}
-
-	@Override
-	public void writeColumnsHeader(ColumnsHeader header) {
 		currentHeader = header;
 		initColumnWidths(header.getColumnCount());
 	}
@@ -99,10 +82,7 @@
 	public void writeEndResultSet() {
 		prefetchDone = true;
 
-		super.writeStartResultSet();
-		super.writeQuery(currentSql);
-		super.writeParameters(currentParameters);
-		super.writeColumnsHeader(currentHeader);
+		super.writeStartResultSet(currentHeader);
 
 		for (Object[] row : currentResultSet) {
 			super.writeStartRow();
@@ -113,8 +93,6 @@
 		}
 
 		currentColumnsCount = 0;
-		currentSql = null;
-		currentParameters = null;
 		currentHeader = null;
 		currentRow = null;
 		currentResultSet = null;