1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Mon Dec 23 16:14:03 2013 +0100
1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/formatting/AbstractFormatter.java Mon Dec 23 16:19:21 2013 +0100
1.3 @@ -55,8 +55,6 @@
1.4 * ...@query
1.5 * ...@parameters
1.6 * ...@updatedRowsCount
1.7 - * ...generatedKeys
1.8 - * ....resultSet (see above)
1.9 */
1.10 protected enum State {
1.11
1.12 @@ -64,8 +62,7 @@
1.13 DATABASE,
1.14 RESULT_SET,
1.15 ROW,
1.16 - UPDATES_RESULT,
1.17 - GENERATED_KEYS
1.18 + UPDATES_RESULT
1.19 }
1.20
1.21 /**
1.22 @@ -134,13 +131,13 @@
1.23
1.24 @Override
1.25 public void writeStartResultSet() {
1.26 - pushState(State.RESULT_SET, EnumSet.of(State.DATABASE, State.GENERATED_KEYS));
1.27 + pushState(State.RESULT_SET, EnumSet.of(State.DATABASE));
1.28 currentRowCount = 0;
1.29 }
1.30
1.31 @Override
1.32 public void writeEndResultSet() {
1.33 - popState(EnumSet.of(State.DATABASE, State.GENERATED_KEYS));
1.34 + popState(EnumSet.of(State.DATABASE));
1.35 currentColumnsHeader = null;
1.36 }
1.37
1.38 @@ -170,7 +167,7 @@
1.39
1.40 @Override
1.41 public void writeColumnsHeader(ColumnsHeader header) {
1.42 - peekState(EnumSet.of(State.RESULT_SET, State.GENERATED_KEYS));
1.43 + peekState(EnumSet.of(State.RESULT_SET));
1.44
1.45 if (currentColumnsHeader == null) {
1.46 currentColumnsHeader = header;
1.47 @@ -229,16 +226,6 @@
1.48 peekState(EnumSet.of(State.UPDATES_RESULT));
1.49 }
1.50
1.51 - @Override
1.52 - public void writeStartGeneratedKeys() {
1.53 - pushState(State.GENERATED_KEYS, EnumSet.of(State.UPDATES_RESULT));
1.54 - }
1.55 -
1.56 - @Override
1.57 - public void writeEndGeneratedKeys() {
1.58 - popState(EnumSet.of(State.UPDATES_RESULT));
1.59 - }
1.60 -
1.61 public FormatterContext getFormatterContext() {
1.62 return formatterContext;
1.63 }