From a6ab96c4cc63aba0ad00b53e83d83fcaa5fa182e Mon Sep 17 00:00:00 2001 From: lukaseder Date: Tue, 12 Jul 2016 17:36:19 +0200 Subject: [PATCH] [#5408] Optimistic locking doesn't work for PostgreSQL, Firebird, and Oracle --- jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java index 863893c9f0..d68dbc82f6 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java @@ -43,6 +43,7 @@ package org.jooq.impl; import static java.util.Arrays.asList; // ... // ... +import static org.jooq.SQLDialect.HSQLDB; // ... // ... // ... @@ -484,7 +485,9 @@ abstract class AbstractDMLQuery extends AbstractQuery { returned = returned.into(table); // [#5366] HSQLDB currently doesn't support fetching updated records in UPDATE statements. - if (returned.size() > 0) { + // [#5408] Other dialects may fall through the switch above (PostgreSQL, Firebird, Oracle) and must + // execute this logic + if (returned.size() > 0 || ctx.family() != HSQLDB) { result = returned.size(); ctx.rows(result); }