From ffe24e3ec285e2effc5cfc5db7e50cd6676af2d2 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Sun, 14 Aug 2011 14:36:57 +0000 Subject: [PATCH] change current_timestamp variable column transform option to system_timestamp to help out informix unit tests --- .../symmetric/transform/VariableColumnTransform.java | 10 +++++++++- .../src/test/resources/test-database-setup.sql | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/VariableColumnTransform.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/VariableColumnTransform.java index 04e8a076e1..d1ae8de0b8 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/VariableColumnTransform.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/VariableColumnTransform.java @@ -12,6 +12,10 @@ public class VariableColumnTransform implements ISingleValueColumnTransform, IBu protected static final String DATE_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS"; + protected static final String OPTION_TIMESTAMP = "system_timestamp"; + + private static final String[] OPTIONS = new String[] {OPTION_TIMESTAMP}; + public boolean isAutoRegister() { return true; } @@ -19,13 +23,17 @@ public boolean isAutoRegister() { public String getName() { return NAME; } + + public static String[] getOptions() { + return OPTIONS; + } public String transform(ICacheContext context, TransformColumn column, TransformedData data, Map sourceValues, String value, String oldValue) throws IgnoreColumnException, IgnoreRowException { String varName = column.getTransformExpression(); if (varName != null) { - if (varName.equalsIgnoreCase("current_timestamp")) { + if (varName.equalsIgnoreCase(OPTION_TIMESTAMP)) { return DateFormatUtils.format(System.currentTimeMillis(), DATE_PATTERN); } } diff --git a/symmetric/symmetric-server/src/test/resources/test-database-setup.sql b/symmetric/symmetric-server/src/test/resources/test-database-setup.sql index 85085e7e74..ff2c30ee18 100644 --- a/symmetric/symmetric-server/src/test/resources/test-database-setup.sql +++ b/symmetric/symmetric-server/src/test/resources/test-database-setup.sql @@ -112,7 +112,7 @@ insert into sym_transform_column (transform_id, include_on, source_column_name, insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) values ('sourceb_to_b', '*', null, 'S1_B', 0, 'lookup', 'select column_two from test_lookup_table where column_one=:ID', 2); insert into sym_transform_column (transform_id, include_on, source_column_name, target_column_name, pk, transform_type, transform_expression, transform_order) - values ('sourceb_to_b', '*', null, 'S2_B', 0, 'variable', 'current_timestamp', 3); + values ('sourceb_to_b', '*', null, 'S2_B', 0, 'variable', 'system_timestamp', 3); insert into sym_transform_table (transform_id, source_node_group_id, target_node_group_id, source_table_name, target_table_name, transform_point, update_first, delete_action, transform_order) values ('one_to_multi', 'test-node-group', 'test-root-group', 'SOURCE_5', 'TARGET_5', 'LOAD', 0, 'NONE', 1);