diff -r 04db6ccd6c48 -r 9335cf31c0f2 java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Sun Dec 22 22:02:44 2013 +0100 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Sun Dec 22 23:31:55 2013 +0100 @@ -110,7 +110,8 @@ */ private State popState(EnumSet expected) { try { - State superior = state.pop(); + state.pop(); + State superior = state.peek(); if (expected.contains(superior)) { return superior; } else { @@ -155,7 +156,7 @@ } @Override - public void writeParameters(List parameters) { + public void writeParameters(List parameters) { peekState(EnumSet.of(State.RESULT_SET, State.UPDATES_RESULT)); if (currentColumnsHeader != null) { @@ -242,6 +243,14 @@ return currentColumnsCount; } + protected boolean isCurrentColumnFirst() { + return currentColumnsCount == 1; + } + + protected boolean isCurrentColumnLast() { + return currentColumnsCount == currentColumnsHeader.getColumnCount(); + } + /** * @return row number, 1 = first */