0002351: Order configuration export for diff reporting

JumpMind · Jul 30, 2015 · e9a2b07 · e9a2b07
1 parent de7e25b
commit e9a2b07
Showing 1 changed file with 14 additions and 1 deletion.
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
@@ -253,8 +253,21 @@ public void extractConfigurationStandalone(Node targetNode, Writer writer, Strin
                             triggerHistory.setTriggerHistoryId(Integer.MAX_VALUE - i);
                         }
 
+                        Table table = symmetricDialect.getPlatform().getTableFromCache(
+                                triggerHistory.getSourceCatalogName(), triggerHistory.getSourceSchemaName(),
+                                triggerHistory.getSourceTableName(), false);
+                        String initialLoadSql = "1=1 order by ";
+                        String quote = symmetricDialect.getPlatform().getDdlBuilder().getDatabaseInfo().getDelimiterToken();
+                        Column[] pkColumns = table.getPrimaryKeyColumns();
+                        for (int j = 0; j < pkColumns.length; j++) {
+                            if (j > 0) {
+                                initialLoadSql += ", "; 
+                            }
+                            initialLoadSql += quote + pkColumns[j].getName() + quote;
+                        }
+
                         if (!triggerRouter.getTrigger().getSourceTableName().endsWith(TableConstants.SYM_NODE_IDENTITY)) {
-                            initialLoadEvents.add(new SelectFromTableEvent(targetNode, triggerRouter, triggerHistory, null));
+                            initialLoadEvents.add(new SelectFromTableEvent(targetNode, triggerRouter, triggerHistory, initialLoadSql));
                         } else {
                             Data data = new Data(1, null, targetNode.getNodeId(), DataEventType.INSERT, triggerHistory.getSourceTableName(),
                                     null, triggerHistory, triggerRouter.getTrigger().getChannelId(), null, null);