Issue #939 - SqlServer doesn't support catalog.

JumpMind · Dec 6, 2012 · 9a4aef0 · 9a4aef0
1 parent 8af040b
commit 9a4aef0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java
@@ -858,8 +858,12 @@ protected String preprocessSqlStatement(CsvData data) {
 
 		String sql = data.getParsedData(CsvData.ROW_DATA)[0];
 		sql = FormatUtils.replace("nodeId", batch.getTargetNodeId(), sql);
-		sql = FormatUtils.replace("catalogName", targetTable.getCatalog(),sql);
-		sql = FormatUtils.replace("schemaName", targetTable.getSchema(), sql);
+		if (targetTable.getCatalog() != null) {
+			sql = FormatUtils.replace("catalogName", targetTable.getCatalog(),sql);
+		}
+		if (targetTable.getSchema() != null) {
+			sql = FormatUtils.replace("schemaName", targetTable.getSchema(), sql);
+		}
 		sql = FormatUtils.replace("tableName", formatTableName(targetTable.getName()), sql);
 
 //		sql = FormatUtils.replace("groupId", node.getNodeGroupId(), sql);