From ac4fa66858b7aa4b204cc877808f60103c7ccd0c Mon Sep 17 00:00:00 2001 From: chenson42 Date: Thu, 26 Jul 2012 17:42:00 +0000 Subject: [PATCH] 0000731: Redo the derby database triggers so they can handle tables with more columns --- .../java/org/jumpmind/symmetric/db/derby/DerbyFunctions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbyFunctions.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbyFunctions.java index 97940b5dd8..7bd2050326 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbyFunctions.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbyFunctions.java @@ -37,7 +37,6 @@ import org.apache.derby.iapi.db.TriggerExecutionContext; import org.apache.derby.iapi.sql.conn.LanguageConnectionContext; import org.apache.derby.impl.jdbc.EmbedConnection; -import org.jumpmind.symmetric.io.data.CsvUtils; public class DerbyFunctions { @@ -135,8 +134,8 @@ public static void insertData(int enabled, String schemaName, String prefixName, String rowData = null; String pkData = null; String oldData = null; - String[] parsedColumnNames = CsvUtils.tokenizeCsvData(columnNames); - String[] parsedPkColumnNames = CsvUtils.tokenizeCsvData(pkColumnNames); + String[] parsedColumnNames = StringUtils.splitPreserveAllTokens(columnNames, ','); + String[] parsedPkColumnNames = StringUtils.splitPreserveAllTokens(pkColumnNames, ','); if (dmlType.equals("I") || dmlType.equals("U")) { StringBuilder dataBuilder = new StringBuilder(); appendCsvString(tableName, parsedColumnNames, parsedPkColumnNames,