0003747: Symmetric should log full SQL Statement when conflict resolu…

…tion SQL fails
JumpMind · Oct 26, 2018 · 1737913 · 1737913
1 parent b9ec80b
commit 1737913
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/...ain/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java
@@ -22,6 +22,7 @@
 
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 import java.util.TimeZone;
@@ -118,8 +119,15 @@ protected boolean isVersionNewer(Conflict conflict, AbstractDatabaseWriter write
         DmlStatement stmt = databaseWriter.getPlatform().createDmlStatement(DmlType.FROM, targetTable
                 , writer.getWriterSettings().getTextColumnExpression());
         String sql = stmt.getColumnsSql(new Column[] { targetTable.getColumnWithName(columnName) });
-        Long existingVersion = databaseWriter.getTransaction()
-                .queryForObject(sql, Long.class, objectValues);
+        Long existingVersion = null;
+
+        try {            
+            existingVersion = databaseWriter.getTransaction().queryForObject(sql, Long.class, objectValues);
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed to execute conflict resolution SQL: \"" + 
+                    sql  + "\" values: " + Arrays.toString(objectValues), ex); 
+        }
+
         if (existingVersion == null) {
             return true;
         } else {