From 45f1a65729ded1a3d18e492b9d5f4b234ce87b53 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 31 May 2013 13:36:36 +0200 Subject: [PATCH] [#2496] Added missing @Support annotations --- jOOQ/src/main/java/org/jooq/DSLContext.java | 4 ++-- jOOQ/src/main/java/org/jooq/Sequence.java | 5 +++-- .../main/java/org/jooq/impl/DefaultDSLContext.java | 12 +----------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java index df87884803..3d8b1bdba4 100644 --- a/jOOQ/src/main/java/org/jooq/DSLContext.java +++ b/jOOQ/src/main/java/org/jooq/DSLContext.java @@ -4554,7 +4554,7 @@ public interface DSLContext { * * @throws DataAccessException if something went wrong executing the query */ - @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, POSTGRES, SYBASE }) + @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE }) T nextval(Sequence sequence) throws DataAccessException; /** @@ -4563,7 +4563,7 @@ public interface DSLContext { * * @throws DataAccessException if something went wrong executing the query */ - @Support({ CUBRID, DB2, FIREBIRD, H2, INGRES, ORACLE, POSTGRES, SYBASE }) + @Support({ CUBRID, DB2, FIREBIRD, H2, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE }) T currval(Sequence sequence) throws DataAccessException; // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/Sequence.java b/jOOQ/src/main/java/org/jooq/Sequence.java index 88e52fc9aa..332f896fa9 100644 --- a/jOOQ/src/main/java/org/jooq/Sequence.java +++ b/jOOQ/src/main/java/org/jooq/Sequence.java @@ -44,6 +44,7 @@ import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.INGRES; import static org.jooq.SQLDialect.ORACLE; import static org.jooq.SQLDialect.POSTGRES; +import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; import java.io.Serializable; @@ -73,12 +74,12 @@ public interface Sequence extends Serializable { /** * Get the current value of this sequence */ - @Support({ CUBRID, DB2, FIREBIRD, H2, INGRES, ORACLE, POSTGRES, SYBASE }) + @Support({ CUBRID, DB2, FIREBIRD, H2, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE }) Field currval(); /** * Increment the sequence and get the next value */ - @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, POSTGRES, SYBASE }) + @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE }) Field nextval(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 3bf9d76862..2a2f885714 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -37,18 +37,11 @@ package org.jooq.impl; import static org.jooq.KeepResultSetMode.CLOSE_AFTER_FETCH; -import static org.jooq.SQLDialect.ASE; import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DB2; -import static org.jooq.SQLDialect.DERBY; -import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.HSQLDB; -import static org.jooq.SQLDialect.INGRES; -import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.ORACLE; -import static org.jooq.SQLDialect.POSTGRES; -import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; import static org.jooq.conf.ParamType.INLINED; @@ -1470,7 +1463,6 @@ public class DefaultDSLContext implements DSLContext, Serializable { // ------------------------------------------------------------------------- @Override - @Support({ ASE, CUBRID, DERBY, H2, HSQLDB, INGRES, MYSQL, SQLITE, SQLSERVER, SYBASE }) public BigInteger lastID() throws DataAccessException { switch (configuration.dialect()) { case DERBY: { @@ -1513,15 +1505,13 @@ public class DefaultDSLContext implements DSLContext, Serializable { } @Override - @Support({ CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, ORACLE, POSTGRES, SYBASE }) public T nextval(Sequence sequence) { Field nextval = sequence.nextval(); return select(nextval).fetchOne(nextval); } @Override - @Support({ CUBRID, DB2, FIREBIRD, H2, INGRES, ORACLE, POSTGRES, SYBASE }) - public T currval(Sequence sequence) throws DataAccessException { + public T currval(Sequence sequence) { Field currval = sequence.currval(); return select(currval).fetchOne(currval); }