0000669: Add schema and catalog to the SymmetricDS Batch XML and chan…

…ge the publisher to fill in the schema and catalog
JumpMind · Aug 11, 2012 · ab78724 · ab78724
1 parent 785d9a7
commit ab78724
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/symmetric-client/src/main/resources/sym_batch.xsd b/symmetric-client/src/main/resources/sym_batch.xsd
@@ -19,6 +19,8 @@
 								</xsd:complexType>
 							</xsd:element>
 						</xsd:sequence>
+                        <xsd:attribute name="catalog" type="xsd:string" use="optional" />
+                        <xsd:attribute name="schema" type="xsd:string" use="optional" />
 						<xsd:attribute name="entity" type="xsd:string" use="required" />
 						<xsd:attribute name="dml" use="required">
 							<xsd:simpleType>
@@ -37,13 +39,7 @@
 					</xsd:complexType>
 				</xsd:element>
 			</xsd:sequence>
-			<xsd:attribute name="id">
-				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:pattern value="[0-9]*" />
-					</xsd:restriction>
-				</xsd:simpleType>
-			</xsd:attribute>
+			<xsd:attribute name="id" type="xsd:string" />
 			<xsd:attribute name="nodeid" type="xsd:string" />
 			<xsd:attribute name="time">
 				<xsd:simpleType>

diff --git a/...er/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java b/...er/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java
@@ -30,6 +30,7 @@
 import java.util.Set;
 
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -107,10 +108,17 @@ protected void finalizeXmlAndPublish(Context context) {
         }
     }
 
-    protected void toXmlElement(DataEventType dml, Element xml, String tableName,
-            String[] columnNames, String[] data, String[] keyNames, String[] keys) {
+    protected void toXmlElement(DataEventType dml, Element xml, String catalogName,
+            String schemaName, String tableName, String[] columnNames, String[] data,
+            String[] keyNames, String[] keys) {
         Element row = new Element("row");
         xml.addContent(row);
+        if (StringUtils.isNotBlank(catalogName)) {
+            row.setAttribute("catalog", catalogName);
+        }
+        if (StringUtils.isNotBlank(schemaName)) {
+            row.setAttribute("schema", schemaName);
+        }
         row.setAttribute("entity", tableName);
         row.setAttribute("dml", dml.getCode());
 
@@ -158,7 +166,7 @@ protected void addFormattedExtraGroupAttributes(Context context, Element xml) {
 
     protected Element getXmlFromCache(Context context, String[] columnNames, String[] data,
             String[] keyNames, String[] keys) {
-        Map<String,Element> xmlCache = getXmlCache(context);
+        Map<String, Element> xmlCache = getXmlCache(context);
         Element xml = null;
         String txId = toXmlGroupId(columnNames, data, keyNames, keys);
         if (txId != null) {
@@ -212,7 +220,7 @@ protected String toXmlGroupId(String[] columnNames, String[] data, String[] keyN
         }
         return null;
     }
-    
+
     public String[] getNodeGroupIdsToApplyTo() {
         return nodeGroups;
     }

diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/XmlPublisherDataRouter.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/XmlPublisherDataRouter.java
@@ -62,7 +62,9 @@ public Set<String> routeToNodes(SimpleRouterContext context, DataMetaData dataMe
                     .getTriggerHistory().getParsedPkColumnNames(), dataMetaData.getData()
                     .toParsedPkData());
             if (xml != null) {
-                toXmlElement(dataMetaData.getData().getDataEventType(), xml, dataMetaData.getData()
+                toXmlElement(dataMetaData.getData().getDataEventType(), xml, dataMetaData
+                        .getTriggerHistory().getSourceCatalogName(), dataMetaData
+                        .getTriggerHistory().getSourceSchemaName(), dataMetaData.getData()
                         .getTableName(), dataMetaData.getTriggerHistory().getParsedColumnNames(),
                         dataMetaData.getData().toParsedRowData(), dataMetaData.getTriggerHistory()
                                 .getParsedPkColumnNames(), dataMetaData.getData().toParsedPkData());

diff --git a/...rver/src/main/java/org/jumpmind/symmetric/integrate/XmlPublisherDatabaseWriterFilter.java b/...rver/src/main/java/org/jumpmind/symmetric/integrate/XmlPublisherDatabaseWriterFilter.java
@@ -74,9 +74,9 @@ public boolean beforeWrite(
                     data.getParsedData(CsvData.ROW_DATA), table.getPrimaryKeyColumnNames(),
                     data.getParsedData(CsvData.PK_DATA));
             if (xml != null) {
-                toXmlElement(data.getDataEventType(), xml, table.getName(), table.getColumnNames(),
-                        data.getParsedData(CsvData.ROW_DATA), table.getPrimaryKeyColumnNames(),
-                        data.getParsedData(CsvData.PK_DATA));
+                toXmlElement(data.getDataEventType(), xml, table.getCatalog(), table.getSchema(),
+                        table.getName(), table.getColumnNames(),
+                        data.getParsedData(CsvData.ROW_DATA), table.getPrimaryKeyColumnNames(), data.getParsedData(CsvData.PK_DATA));
             }
         } else if (log.isDebugEnabled()) {
             log.debug("'{}' not in list to publish", table.getName());