Merge remote-tracking branch 'origin/3.8' into 3.9

JumpMind · Jun 2, 2017 · a056917 · a056917
2 parents 10b32a2 + b15da60
commit a056917
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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
@@ -1743,7 +1743,7 @@ public CsvData next() {
                                             .getRouter().getRouterId(), triggerHistory, false, true);
                                 }
                                 Column[] columns = sourceTable.getPrimaryKeyColumns();
-                                DmlStatement dmlStmt = DmlStatementFactory.createDmlStatement(symmetricDialect.getName(), DmlType.WHERE, sourceTable, true);
+                                DmlStatement dmlStmt = platform.createDmlStatement(DmlType.WHERE, sourceTable, null);
                                 String[] pkData = data.getParsedData(CsvData.PK_DATA);
                                 Row row = new Row(columns.length);
 

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2As400DdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2As400DdlReader.java
@@ -169,7 +169,7 @@ public List<Trigger> getTriggers(final String catalog, final String schema,
 				.getSqlTemplate();
 
 		String sql = "SELECT "
-						+ "TIGGER_NAME, "
+						+ "TRIGGER_NAME, "
 						+ "TRIGGER_SCHEMA, "
 						+ "EVENT_OBJECT_TABLE as TABLE_NAME, "
 						+ "ACTION_TIMING as TRIGGER_TIME, "