github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1003] Sybase / SQL Server / MySQL / Ingres / H2 / Derby INSERT .. RETURNING returns null if a table has an IDENTITY column, but no main unique key

Browse Source
This commit is contained in:
Lukas Eder 2011-12-18 17:27:56 +00:00
parent 2b477494e9
commit ba236e720e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
View File

@ -678,8 +678,6 @@ public abstract class jOOQAbstractTest<
// Identity tables without primary key
if (TIdentity() != null) {
// TODO [#1003] This doesn't work for Sybase, SQL Server, Ingres, H2, Derby, ASE
testInsertIdentity0(TIdentity(), TIdentity_ID(), TIdentity_VAL());
}
}

14
jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
View File

@ -447,13 +447,13 @@ class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
*/
@SuppressWarnings("unchecked")
private final void selectReturning(Configuration configuration, Object... values) {
if (getInto() instanceof UpdatableTable) {
UpdatableTable<R> updatable = (UpdatableTable<R>) getInto();
if (values != null && values.length > 0) {
Table<R> into = getInto();
// This shouldn't be null, as relevant dialects should
// return empty generated keys ResultSet
if (updatable.getIdentity() != null) {
Field<Number> field = (Field<Number>) updatable.getIdentity().getField();
if (into.getIdentity() != null) {
Field<Number> field = (Field<Number>) into.getIdentity().getField();
Number[] ids = new Number[values.length];
for (int i = 0; i < values.length; i++) {
ids[i] = field.getDataType().convert(values[i]);
@ -463,7 +463,7 @@ class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
// additional query
if (returning.size() == 1 && returning.get(0).equals(field)) {
for (Number id : ids) {
R typed = Util.newRecord(getInto(), configuration);
R typed = Util.newRecord(into, configuration);
((AbstractRecord) typed).setValue(field, new Value<Number>(id));
getReturnedRecords().add(typed);
}
@ -473,9 +473,9 @@ class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements
else {
returned =
create(configuration).select(returning)
.from(updatable)
.from(into)
.where(field.in(ids))
.fetchInto(getInto());
.fetchInto(into);
}
}
}