Allow sym_data row_data to be sync'd even if the original source tabl…

…es don't exist in the database anymore.
JumpMind · Nov 16, 2012 · 1d4f71e · 1d4f71e
1 parent c220ea9
commit 1d4f71e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -461,9 +461,7 @@ protected OutgoingBatch extractOutgoingBatch(Node targetNode,
                         currentBatch.isCommonFlag());
                 batch.setIgnored(true);
                 try {
-                    IStagedResource resource = stagingManager.find(
-                            Constants.STAGING_CATEGORY_OUTGOING, batch.getStagedLocation(),
-                            batch.getBatchId());
+                    IStagedResource resource = getStagedResource(currentBatch);
                     if (resource != null) {
                         resource.delete();
                     }
@@ -646,8 +644,8 @@ protected Table lookupAndOrderColumnsAccordingToTriggerHistory(String routerId,
         Table table = symmetricDialect.getPlatform().getTableFromCache(catalogName, schemaName,
                 tableName, false);
         if (table == null) {
-            throw new RuntimeException(String.format("Could not find the table, %s, to extract",
-                    Table.getFullyQualifiedTableName(catalogName, schemaName, tableName)));
+            table = new Table(tableName);
+            table.addColumns(triggerHistory.getParsedColumnNames());
         }
         table = table.copyAndFilterColumns(triggerHistory.getParsedColumnNames(),
                 triggerHistory.getParsedPkColumnNames(), true);

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/model/Table.java b/symmetric-db/src/main/java/org/jumpmind/db/model/Table.java
@@ -306,6 +306,14 @@ public void addColumns(Collection<Column> columns) {
             addColumn((Column) it.next());
         }
     }
+
+    public void addColumns(String[] columnNames) {
+        if (columnNames != null) {
+            for (String columnName : columnNames) {
+                addColumn(new Column(columnName));
+            }
+        }
+    }
 
     /**
      * Removes the given column.