From 8738daa0f575d5d5078a10c7f8c76f0089b42174 Mon Sep 17 00:00:00 2001 From: Victor Camargo Date: Mon, 3 Jul 2023 09:26:50 +0100 Subject: [PATCH] Revert "Add Support to Upsert/Insert Ignore on PDB" This reverts commit 5ad2cb62302c0b4fba8802e8063a3a514ca0f847. --- .../commons/sql/abstraction/engine/impl/DB2Engine.java | 4 ++-- .../feedzai/commons/sql/abstraction/engine/impl/H2Engine.java | 4 ++-- .../commons/sql/abstraction/engine/impl/MySqlEngine.java | 2 +- .../commons/sql/abstraction/engine/impl/PostgreSqlEngine.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java index cf72664a..44636835 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/DB2Engine.java @@ -444,7 +444,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psUpsert); } catch (final IllegalArgumentException e) { - logger.error("Returning entity without an UPSERT/MERGE prepared statement.", e); + logger.trace("Returning entity without an UPSERT/MERGE prepared statement."); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -472,7 +472,7 @@ private String buildUpsertStatement(final DbEntity entity, final List co throw new IllegalArgumentException("The MERGE command was not created because the entity has no primary keys. Skipping statement creation."); } - final List merge = new ArrayList<>(); + List merge = new ArrayList<>(); merge.add("MERGE INTO " + quotize(entity.getName()) + " AS dest"); merge.add("USING (VALUES(" + join(values, ", ") + ")) AS src (" + join(columns, ", ") + ")"); diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java index 45fac776..0b5eaf93 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/H2Engine.java @@ -493,7 +493,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psMerge); } catch (final IllegalArgumentException e) { - logger.error("Returning entity without an UPSERT/MERGE prepared statement.", e); + logger.trace("Returning entity without an UPSERT/MERGE prepared statement."); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) @@ -516,7 +516,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) private String buildUpsertStatement(final DbEntity entity, final List columns, final List values) { if (entity.getPkFields().isEmpty() || columns.isEmpty() || values.isEmpty()) { - throw new IllegalArgumentException("The MERGE command was not created because the entity has no primary keys. Skipping statement creation."); + return ""; } final List mergeInto = new ArrayList<>(); diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java index 34be8ae8..0f88e310 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/MySqlEngine.java @@ -408,7 +408,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setUpsert(psUpsert); } catch (final IllegalArgumentException e) { - logger.error("Returning entity without an UPSERT/MERGE prepared statement.", e); + logger.trace("Returning entity without an UPSERT/MERGE prepared statement."); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn) diff --git a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java index 3abf707e..20fdb439 100644 --- a/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java +++ b/src/main/java/com/feedzai/commons/sql/abstraction/engine/impl/PostgreSqlEngine.java @@ -429,7 +429,7 @@ protected MappedEntity createPreparedStatementForInserts(final DbEntity entity) .setAutoIncColumn(returning); } catch (final IllegalArgumentException e) { - logger.error("Returning entity without an UPSERT/MERGE prepared statement.", e); + logger.trace("Returning entity without an UPSERT/MERGE prepared statement."); return new MappedEntity() .setInsert(ps) .setInsertReturning(psReturn)