[jOOQ/jOOQ#14571] Fix regression of [jOOQ/jOOQ#13574] for Oracle

UpdatableRecord::merge produces its update count in ctx.rows() for Oracle (and some others). That update count was discarded previously, although prior to fixing [jOOQ/jOOQ#14571], the initial value of result = 1 coincidentally produced the expected result.
This commit is contained in:
Lukas Eder 2023-02-09 11:22:11 +01:00
parent fd32a9f0bc
commit ae21a35eb9

View File

@ -1236,7 +1236,8 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
// [#13574] The DML statement itself may have produced a rowcount
// but the returned results might be empty, so keep the
// higher value of the two
result = Math.max(result, returnedResult.size());
// [#14571] The DML rowcount may have already been set to ctx.rows()
result = Math.max(Math.max(result, ctx.rows()), returnedResult.size());
ctx.rows(result);
}