From d3c9ada254d60d260f9282ef96d693dd57032fdb Mon Sep 17 00:00:00 2001 From: joshahicks Date: Fri, 14 Jan 2022 11:41:13 -0500 Subject: [PATCH] 0005194: DBCompare support for load only target nodes and log based source nodes. --- .../org/jumpmind/symmetric/io/DbCompare.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java index f68593f030..afd17a3bfd 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java @@ -136,7 +136,7 @@ protected OutputStream getSqlDiffOutputStream(DbCompareTables tables) { } protected TableReport compareTables(DbCompareTables tables, OutputStream sqlDiffOutput) { - String sourceSelect = getSourceComparisonSQL(tables, sourceEngine.getDatabasePlatform()); + String sourceSelect = getSourceComparisonSQL(tables, sourceEngine.getTargetDialect().getTargetPlatform()); String targetSelect = getTargetComparisonSQL(tables, targetEngine.getTargetDialect().getTargetPlatform()); //String targetSelect = getTargetComparisonSQL(tables, targetEngine.getDatabasePlatform()); @@ -347,14 +347,14 @@ protected List loadTables(List tableNames, List for (int i = 0; i < filteredTablesNames.size(); i++) { String tableName = filteredTablesNames.get(i); Table sourceTable = null; - Map tableNameParts = sourceEngine.getDatabasePlatform().parseQualifiedTableName(tableName); + Map tableNameParts = sourceEngine.getTargetDialect().getTargetPlatform().parseQualifiedTableName(tableName); if (tableNameParts.size() == 1) { - sourceTable = sourceEngine.getDatabasePlatform().getTableFromCache(tableName, true); + sourceTable = sourceEngine.getTargetDialect().getTargetPlatform().getTableFromCache(tableName, true); } else { - sourceTable = sourceEngine.getDatabasePlatform().getTableFromCache(tableNameParts.get("catalog"), tableNameParts.get("schema"), tableNameParts + sourceTable = sourceEngine.getTargetDialect().getTargetPlatform().getTableFromCache(tableNameParts.get("catalog"), tableNameParts.get("schema"), tableNameParts .get("table"), true); if (sourceTable == null) { - sourceTable = sourceEngine.getDatabasePlatform().getTableFromCache(tableNameParts.get("schema"), tableNameParts.get("catalog"), + sourceTable = sourceEngine.getTargetDialect().getTargetPlatform().getTableFromCache(tableNameParts.get("schema"), tableNameParts.get("catalog"), tableNameParts.get("table"), true); } } @@ -365,10 +365,10 @@ protected List loadTables(List tableNames, List if (config.isUseSymmetricConfig()) { String catalog = null; String schema = null; - if (!StringUtils.equals(sourceEngine.getDatabasePlatform().getDefaultCatalog(), sourceTable.getCatalog())) { + if (!StringUtils.equals(sourceEngine.getTargetDialect().getTargetPlatform().getDefaultCatalog(), sourceTable.getCatalog())) { catalog = sourceTable.getCatalog(); } - if (!StringUtils.equals(sourceEngine.getDatabasePlatform().getDefaultSchema(), sourceTable.getSchema())) { + if (!StringUtils.equals(sourceEngine.getTargetDialect().getTargetPlatform().getDefaultSchema(), sourceTable.getSchema())) { schema = sourceTable.getSchema(); } TriggerHistory hist = sourceEngine.getTriggerRouterService().findTriggerHistory(catalog, schema, @@ -551,7 +551,7 @@ protected boolean compareTableNames(String sourceTableName, String targetTableNa if (StringUtils.equalsIgnoreCase(sourceTableName, targetTableName)) { return true; } else { - Map sourceTableNameParts = sourceEngine.getDatabasePlatform().parseQualifiedTableName(sourceTableName); + Map sourceTableNameParts = sourceEngine.getTargetDialect().getTargetPlatform().parseQualifiedTableName(sourceTableName); Map targetTableNameParts = targetEngine.getTargetDialect().getTargetPlatform().parseQualifiedTableName(targetTableName); return StringUtils.equalsIgnoreCase(sourceTableNameParts.get("table"), targetTableNameParts.get("table")); }