From f0b71d61382960718c7ec7931d4d0ef1eee76326 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Thu, 6 Sep 2012 00:57:38 +0000
Subject: [PATCH] 0000803: Check that column names match column values in the
 abstract router. If not log details.

---
 .../symmetric/route/AbstractDataRouter.java        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java
index d44cd0fb85..29f54e29fd 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java
@@ -97,7 +97,7 @@ protected Map<String, String> getDataAsString(String prefix, DataMetaData dataMe
         String[] columns = dataMetaData.getTriggerHistory().getParsedColumnNames();
         Map<String, String> map = new HashMap<String, String>(columns.length);
         if (rowData != null) {
-            testSize(dataMetaData, symmetricDialect, columns, rowData);
+            testColumnNamesMatchValues(dataMetaData, symmetricDialect, columns, rowData);
             for (int i = 0; i < columns.length; i++) {
                 String columnName = columns[i].toUpperCase();
                 map.put(prefix != null ? prefix + columnName : columnName, rowData[i]);
@@ -111,7 +111,7 @@ protected Map<String, String> getPkDataAsString(DataMetaData dataMetaData, ISymm
         String[] rowData = dataMetaData.getData().toParsedPkData();
         Map<String, String> map = new HashMap<String, String>(columns.length);
         if (rowData != null) {
-            testSize(dataMetaData, symmetricDialect, columns, rowData);
+            testColumnNamesMatchValues(dataMetaData, symmetricDialect, columns, rowData);
             for (int i = 0; i < columns.length; i++) {
                 String columnName = columns[i].toUpperCase();
                 map.put(columnName, rowData[i]);
@@ -179,7 +179,7 @@ protected Map<String, Object> getDataAsObject(String prefix, DataMetaData dataMe
             Object[] objects = symmetricDialect.getPlatform().getObjectValues(
                     symmetricDialect.getBinaryEncoding(), dataMetaData.getTable(), columnNames,
                     rowData);
-            testSize(dataMetaData, symmetricDialect, columnNames, objects);
+            testColumnNamesMatchValues(dataMetaData, symmetricDialect, columnNames, objects);
             for (int i = 0; i < columnNames.length; i++) {
                 String upperCase = columnNames[i].toUpperCase();
                 data.put(prefix != null ? (prefix + upperCase) : upperCase, objects[i]);
@@ -190,12 +190,12 @@ protected Map<String, Object> getDataAsObject(String prefix, DataMetaData dataMe
         }
     }
 
-    protected void testSize(DataMetaData dataMetaData, ISymmetricDialect symmetricDialect, String[] columnNames, Object[] values) {
+    protected void testColumnNamesMatchValues(DataMetaData dataMetaData, ISymmetricDialect symmetricDialect, String[] columnNames, Object[] values) {
         if (columnNames.length != values.length) {
             String possibleOracleErrorMessage = "";
             if (symmetricDialect.getPlatform().getName().equals(DatabaseNamesConstants.ORACLE)) {
-                boolean isUseCaptureLobs = dataMetaData.getTriggerRouter().getTrigger().isUseCaptureLobs();
-                possibleOracleErrorMessage = String.format("One possible cause of this issue is when trigger.use_capture_lobs=0 and the captured row_data size exceeds 4k, captured data will be truncated at 4k. trigger.use_capture_lobs is currently set to %s.", isUseCaptureLobs ? "1" : "0");
+                boolean isContainsBigLobs = dataMetaData.getNodeChannel().isContainsBigLob();
+                possibleOracleErrorMessage = String.format("One possible cause of this issue is when channel.contains_big_lobs=0 and the captured row_data size exceeds 4k, captured data will be truncated at 4k. channel.contains_big_lobs is currently set to %s.", isContainsBigLobs ? "1" : "0");
             }
             String message = String.format(
                     "The number of recorded column names (%d) did not match the number of captured data values (%d).  The failed data_id is %d and the event type is %s. %s\ncolumn_names:\n%s\nvalues:\n%s",
@@ -217,7 +217,7 @@ protected Map<String, Object> getPkDataAsObject(DataMetaData dataMetaData,
             Object[] objects = symmetricDialect.getPlatform().getObjectValues(
                     symmetricDialect.getBinaryEncoding(), dataMetaData.getTable(), columnNames,
                     rowData);
-            testSize(dataMetaData, symmetricDialect, columnNames, objects);
+            testColumnNamesMatchValues(dataMetaData, symmetricDialect, columnNames, objects);
             for (int i = 0; i < columnNames.length; i++) {
                 data.put(columnNames[i].toUpperCase(), objects[i]);
             }