0004280: Oracle Bulk Loader: Allow specification of field terminator and

line terminator
JumpMind · Feb 10, 2020 · ecaa3bb · ecaa3bb
1 parent 72aaa41
commit ecaa3bb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ext/TiberoBulkDataLoaderFactory.java
@@ -72,10 +72,12 @@ public IDataWriter getDataWriter(String sourceNodeId, ISymmetricDialect symmetri
         String tbLoaderCommand = parmService.getString(ParameterConstants.DBDIALECT_TIBERO_BULK_LOAD_TBLOADER_CMD);
         String tbLoaderOptions = parmService.getString(ParameterConstants.DBDIALECT_TIBERO_BULK_LOAD_TBLOADER_OPTIONS);
         String dbName = parmService.getString(ParameterConstants.DBDIALECT_TIBERO_BULK_LOAD_DBNAME);
+        String lineTerminator = parmService.getString(ParameterConstants.DBDIALECT_TIBERO_BULK_LINE_TERMINATOR);
+        String fieldTerminator = parmService.getString(ParameterConstants.DBDIALECT_TIBERO_BULK_FIELD_TERMINATOR);
 
         return new TiberoBulkDatabaseWriter(symmetricDialect.getPlatform(), symmetricDialect.getTargetPlatform(),
                 engine.getStagingManager(), engine.getTablePrefix(), tbLoaderCommand, tbLoaderOptions,
-                dbUser, dbPassword, dbUrl, dbName,
+                dbUser, dbPassword, dbUrl, dbName, null, fieldTerminator, lineTerminator,
                 buildDatabaseWriterSettings(filters, errorHandlers, conflictSettings, resolvedData));
     }
 

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/TiberoBulkDatabaseWriter.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/TiberoBulkDatabaseWriter.java
@@ -32,9 +32,11 @@ public class TiberoBulkDatabaseWriter extends OracleBulkDatabaseWriter {
 
     public TiberoBulkDatabaseWriter(IDatabasePlatform symmetricPlatform, IDatabasePlatform targetPlatform,
             IStagingManager stagingManager, String tablePrefix, String tbLoaderCommand, String tbLoaderOptions,
-            String dbUser, String dbPassword, String dbUrl, String dbName, DatabaseWriterSettings settings) {
+            String dbUser, String dbPassword, String dbUrl, String dbName, String sqlLoaderInfileCharset,
+            String fieldTerminator, String lineTerminator,
+            DatabaseWriterSettings settings) {
         super(symmetricPlatform, targetPlatform, stagingManager, tablePrefix, tbLoaderCommand, tbLoaderOptions,
-                dbUser, dbPassword, dbUrl, dbName, null, settings);
+                dbUser, dbPassword, dbUrl, dbName, sqlLoaderInfileCharset, fieldTerminator, lineTerminator, settings);
         logger = LoggerFactory.getLogger(getClass());
     }
 
@@ -57,7 +59,7 @@ protected String getInfileControl() {
 
     @Override
     protected String getLineTerminatedByControl() {
-        return "LINES TERMINATED BY '" + LINE_TERMINATOR + "'\n";
+        return "LINES TERMINATED BY '" + lineTerminator + "'\n";
     }
 
     @Override

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -267,6 +267,8 @@ private ParameterConstants() {
     public final static String DBDIALECT_TIBERO_BULK_LOAD_TBLOADER_CMD = "tibero.bulk.load.tbloader.cmd";
     public final static String DBDIALECT_TIBERO_BULK_LOAD_TBLOADER_OPTIONS = "tibero.bulk.load.tbloader.options";
     public final static String DBDIALECT_TIBERO_BULK_LOAD_DBNAME = "tibero.bulk.load.dbname";
+    public final static String DBDIALECT_TIBERO_BULK_LINE_TERMINATOR = "tibero.bulk.load.line.terminator";
+    public final static String DBDIALECT_TIBERO_BULK_FIELD_TERMINATOR = "tibero.bulk.load.field.terminator";
 
     public final static String DBDIALECT_ORACLE_TRANSACTION_VIEW_CLOCK_SYNC_THRESHOLD_MS = "oracle.transaction.view.clock.sync.threshold.ms";
 

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -1888,6 +1888,20 @@ tibero.bulk.load.tbloader.options=direct=N dpl_parallel=1 disable_idx=N readsize
 # DatabaseOverridable: false
 tibero.bulk.load.dname=
 
+# Specify the line terminator used by the Tibero tbLoader.  Pick something that does not exist in the
+# data in your database. 
+#
+# DatabaseOverridable: true
+# Tags: other, tibero
+tibero.bulk.load.line.terminator=|>
+
+# Specify the field terminator used by the Tibero tbLoader.  Pick something that does not exist in the
+# data in your database. 
+#
+# DatabaseOverridable: true
+# Tags: other, tibero
+tibero.bulk.load.field.terminator=|}
+
 # Use to map the version string a zseries jdbc driver returns to the 'zseries' dialect
 # Tags: other
 db2.zseries.version=DSN08015