diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java index dcc68090b7..fd0ff33f2c 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DefaultDataLoaderFactory.java @@ -124,7 +124,7 @@ protected DatabaseWriterSettings buildDatabaseWriterSettings( for (Conflict conflictSetting : conflictSettings) { String qualifiedTableName = conflictSetting.toQualifiedTableName(); if (StringUtils.isNotBlank(qualifiedTableName)) { - byTable.put(qualifiedTableName, conflictSetting); // ADB + byTable.put(qualifiedTableName, conflictSetting); } else if (StringUtils.isNotBlank(conflictSetting.getTargetChannelId())) { byChannel.put(conflictSetting.getTargetChannelId(), conflictSetting); } else { diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/Conflict.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/Conflict.java index 35762d8257..c81fd2591b 100644 --- a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/Conflict.java +++ b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/Conflict.java @@ -64,7 +64,7 @@ public enum DetectExpressionKey { public String toQualifiedTableName() { if (StringUtils.isNotBlank(targetTableName)) { return Table.getFullyQualifiedTableName(targetCatalogName, targetSchemaName, - targetTableName); + targetTableName).toLowerCase(); } else { return null; } diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriterSettings.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriterSettings.java index 604ba59a57..46a786d707 100644 --- a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriterSettings.java +++ b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriterSettings.java @@ -206,12 +206,12 @@ public void addErrorHandler(IDatabaseWriterErrorHandler handler) { public Conflict pickConflict(Table table, Batch batch) { Conflict settings = null; - String fullyQualifiedName = table.getFullyQualifiedTableName(); + String fullyQualifiedName = table.getFullyQualifiedTableName().toLowerCase(); if (conflictSettingsByTable != null) { Conflict found = conflictSettingsByTable.get(fullyQualifiedName); if (found == null) { - found = conflictSettingsByTable.get(table.getName()); + found = conflictSettingsByTable.get(table.getName().toLowerCase()); } if (found != null