From 42fae20ac33ee57c37fe69bef9a80a95da85ab33 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 15 Aug 2023 10:58:38 +0200 Subject: [PATCH] [jOOQ/jOOQ#15468] INSERT .. ON CONFLICT .. DO NOTHING emulation should use MERGE in Firebird 3, HANA --- .../main/java/org/jooq/impl/InsertQueryImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java index 1ac564b087..469c255726 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java @@ -545,14 +545,23 @@ implements - - case FIREBIRD: case IGNITE: case TRINO: { acceptInsertSelect(ctx); break; } + case FIREBIRD: { + + + + + + acceptMerge(ctx); + + break; + } + case DUCKDB: @@ -629,6 +638,7 @@ implements + case H2: case HSQLDB: { acceptMerge(ctx);