Revert "Add Support to Upsert/Insert Ignore on PDB"

This reverts commit 5ad2cb6.
feedzai · Jul 3, 2023 · 8738daa · 8738daa
1 parent 511f56b
commit 8738daa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 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
@@ -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<String> co
             throw new IllegalArgumentException("The MERGE command was not created because the entity has no primary keys. Skipping statement creation.");
         }
 
-        final List<String> merge = new ArrayList<>();
+        List<String> 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
@@ -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<String> columns, final List<String> 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<String> 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
@@ -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
@@ -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)