diff --git a/pom.xml b/pom.xml
index 3cce0ce..fdd24fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
- 8.1-SNAPSHOT
+ 8.2.0.0-342
1.9.5
4.4
diff --git a/src/main/java/org/pentaho/di/dataset/DataSet.java b/src/main/java/org/pentaho/di/dataset/DataSet.java
index c51eda4..54cfeaa 100755
--- a/src/main/java/org/pentaho/di/dataset/DataSet.java
+++ b/src/main/java/org/pentaho/di/dataset/DataSet.java
@@ -103,6 +103,7 @@ public RowMetaInterface getSetRowMeta( boolean columnName ) throws KettlePluginE
field.getLength(),
field.getPrecision() );
valueMeta.setComments( field.getComment() );
+ valueMeta.setConversionMask( field.getFormat() );
rowMeta.addValueMeta( valueMeta );
}
return rowMeta;
diff --git a/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java b/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java
index 55e5c60..74249d3 100644
--- a/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java
+++ b/src/main/java/org/pentaho/di/dataset/DataSetCsvGroup.java
@@ -71,18 +71,20 @@ private static String getDataSetFolder( DataSetGroup group ) {
private static void setValueFormats( RowMetaInterface rowMeta ) {
for ( ValueMetaInterface valueMeta : rowMeta.getValueMetaList() ) {
- switch ( valueMeta.getType() ) {
- case ValueMetaInterface.TYPE_INTEGER:
- valueMeta.setConversionMask( "0" );
- break;
- case ValueMetaInterface.TYPE_NUMBER:
- valueMeta.setConversionMask( "0.#" );
- break;
- case ValueMetaInterface.TYPE_DATE:
- valueMeta.setConversionMask( "yyyyMMdd-HHmmss.SSS" );
- break;
- default:
- break;
+ if ( StringUtils.isEmpty( valueMeta.getConversionMask() ) ) {
+ switch ( valueMeta.getType() ) {
+ case ValueMetaInterface.TYPE_INTEGER:
+ valueMeta.setConversionMask( "0" );
+ break;
+ case ValueMetaInterface.TYPE_NUMBER:
+ valueMeta.setConversionMask( "0.#" );
+ break;
+ case ValueMetaInterface.TYPE_DATE:
+ valueMeta.setConversionMask( "yyyyMMdd-HHmmss.SSS" );
+ break;
+ default:
+ break;
+ }
}
}
}
@@ -117,15 +119,15 @@ public static final List