From 0c6edbc807cc57fa2acbbdb92c9d9074c611f50b Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 12 Sep 2011 17:26:47 +0000 Subject: [PATCH] Release 1.6.6 - Javadoc fix --- jOOQ/src/main/java/org/jooq/InsertQuery.java | 20 +++++++++---------- .../main/java/org/jooq/InsertResultStep.java | 11 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/InsertQuery.java b/jOOQ/src/main/java/org/jooq/InsertQuery.java index afc5272cb7..dd5579085e 100644 --- a/jOOQ/src/main/java/org/jooq/InsertQuery.java +++ b/jOOQ/src/main/java/org/jooq/InsertQuery.java @@ -182,16 +182,15 @@ public interface InsertQuery> extends StoreQuery, In * clauses *
  • HSQLDB, Oracle, and DB2 JDBC drivers allow for retrieving any table * column as "generated key" in one statement
  • - *
  • Derby, H2, MySQL, SQL Server only allow for retrieving IDENTITY - * column values as "generated key". If other fields are requested, a second - * statement is issued. Client code must assure transactional integrity - * between the two statements.
  • + *
  • Derby, H2, Ingres, MySQL, SQL Server only allow for retrieving + * IDENTITY column values as "generated key". If other fields are requested, + * a second statement is issued. Client code must assure transactional + * integrity between the two statements.
  • *
  • Sybase and SQLite allow for retrieving IDENTITY values as * @@identity or last_inserted_rowid() values. * Those values are fetched in a separate SELECT statement. If * other fields are requested, a second statement is issued. Client code * must assure transactional integrity between the two statements.
  • - *
  • Ingres support will be added with #808
  • * * * @see #getReturnedRecords() @@ -208,17 +207,18 @@ public interface InsertQuery> extends StoreQuery, In * clauses *
  • HSQLDB, Oracle, and DB2 JDBC drivers allow for retrieving any table * column as "generated key" in one statement
  • - *
  • Derby, H2, MySQL, SQL Server only allow for retrieving IDENTITY - * column values as "generated key". If other fields are requested, a second - * statement is issued. Client code must assure transactional integrity - * between the two statements.
  • + *
  • Derby, H2, Ingres, MySQL, SQL Server only allow for retrieving + * IDENTITY column values as "generated key". If other fields are requested, + * a second statement is issued. Client code must assure transactional + * integrity between the two statements.
  • *
  • Sybase and SQLite allow for retrieving IDENTITY values as * @@identity or last_inserted_rowid() values. * Those values are fetched in a separate SELECT statement. If * other fields are requested, a second statement is issued. Client code * must assure transactional integrity between the two statements.
  • - *
  • Ingres support will be added with #808
  • * + *

    + * This currently only works well for DB2, HSQLDB, MySQL, and Postgres */ Result getReturnedRecords(); diff --git a/jOOQ/src/main/java/org/jooq/InsertResultStep.java b/jOOQ/src/main/java/org/jooq/InsertResultStep.java index 9d133367dc..72167b5b89 100644 --- a/jOOQ/src/main/java/org/jooq/InsertResultStep.java +++ b/jOOQ/src/main/java/org/jooq/InsertResultStep.java @@ -55,16 +55,15 @@ import java.sql.SQLException; *

  • Postgres has native support for INSERT .. RETURNING clauses
  • *
  • HSQLDB, Oracle, and DB2 JDBC drivers allow for retrieving any table * column as "generated key" in one statement
  • - *
  • Derby, H2, MySQL, SQL Server only allow for retrieving IDENTITY column - * values as "generated key". If other fields are requested, a second statement - * is issued. Client code must assure transactional integrity between the two - * statements.
  • + *
  • Derby, H2, Ingres, MySQL, SQL Server only allow for retrieving IDENTITY + * column values as "generated key". If other fields are requested, a second + * statement is issued. Client code must assure transactional integrity between + * the two statements.
  • *
  • Sybase and SQLite allow for retrieving IDENTITY values as * @@identity or last_inserted_rowid() values. Those * values are fetched in a separate SELECT statement. If other * fields are requested, a second statement is issued. Client code must assure * transactional integrity between the two statements.
  • - *
  • Ingres support will be added with #808
  • * * * @author Lukas Eder @@ -74,6 +73,8 @@ public interface InsertResultStep extends Insert { /** * The result holding returned values as specified by the * {@link InsertReturningStep} + *

    + * This currently only works well for DB2, HSQLDB, MySQL, and Postgres */ Result fetch() throws SQLException;