Add Missing Types

Author: bytefish

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/BigDecimalConverter.java

@@ -4,12 +4,15 @@
 package de.bytefish.jsqlserverbulkinsert.converters;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 public class BigDecimalConverter extends BaseConverter<BigDecimal> {
 
     private final int scale;
+    private final RoundingMode roundingMode;
 
-    public BigDecimalConverter(int scale) {
+    public BigDecimalConverter(int scale, RoundingMode roundingMode) {
+        this.roundingMode = roundingMode;
         this.scale = scale;
     }
 

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/NullConverter.java

@@ -0,0 +1,8 @@
+package de.bytefish.jsqlserverbulkinsert.converters;
+
+public class NullConverter<TPropertyType> extends BaseConverter<TPropertyType> {
+    @Override
+    public Object internalConvert(TPropertyType value) {
+        return null;
+    }
+}

…nsert/converters/CharacterConverter.java …bulkinsert/converters/TextConverter.javaJSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/CharacterConverter.java renamed to JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/TextConverter.java JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/CharacterConverter.java renamed to JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/converters/TextConverter.java

@@ -3,7 +3,7 @@
 
 package de.bytefish.jsqlserverbulkinsert.converters;
 
-public class CharacterConverter extends BaseConverter<Character> {
+public class TextConverter extends BaseConverter<Character> {
     @Override
     public Object internalConvert(Character value) {
         return value;

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/mapping/AbstractMapping.java

@@ -10,6 +10,7 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.*;
@@ -48,17 +49,42 @@ protected void mapBoolean(String columnName, ToBooleanFunction<TEntity> property
     // region Text Functions
 
     protected void mapChar(String columnName, Function<TEntity, Character> propertyGetter) {
-        mapProperty(columnName, Types.CHAR, propertyGetter, new CharacterConverter());
+        mapProperty(columnName, Types.CHAR, propertyGetter, new TextConverter());
+    }
+
+    protected void mapNchar(String columnName, Function<TEntity, Character> propertyGetter) {
+        mapProperty(columnName, Types.NCHAR, propertyGetter, new TextConverter());
+    }
+
+    protected void mapClob(String columnName, Function<TEntity, Character> propertyGetter) {
+        mapProperty(columnName, Types.CLOB, propertyGetter, new TextConverter());
     }
 
     protected void mapVarchar(String columnName, Function<TEntity, String> propertyGetter) {
         mapProperty(columnName, Types.VARCHAR, propertyGetter, new VarcharConverter());
     }
 
+    protected void mapLongVarchar(String columnName, Function<TEntity, Character> propertyGetter) {
+        mapProperty(columnName, Types.LONGVARCHAR, propertyGetter, new TextConverter());
+    }
+
     protected void mapNvarchar(String columnName, Function<TEntity, String> propertyGetter) {
         mapProperty(columnName, Types.NVARCHAR, propertyGetter, new NVarcharConverter());
     }
 
+    protected void mapLongNvarchar(String columnName, Function<TEntity, Character> propertyGetter) {
+        mapProperty(columnName, Types.LONGNVARCHAR, propertyGetter, new TextConverter());
+    }
+
+
+    // endregion
+
+    // region Special Functions
+
+    protected <TProperty>  void mapNull(String columnName, Function<TEntity, TProperty> propertyGetter) {
+        mapProperty(columnName, Types.NULL, propertyGetter, new NullConverter<>());
+    }
+
     // endregion
 
     // region Numeric Functions
@@ -106,11 +132,14 @@ protected void mapLong(String columnName, ToLongFunction<TEntity> propertyGetter
     }
 
     protected void mapNumeric(String columnName, int precision, int scale, Function<TEntity, BigDecimal> propertyGetter) {
-        mapProperty(columnName, Types.NUMERIC, precision, scale, false, propertyGetter, new BigDecimalConverter(scale));
+        mapProperty(columnName, Types.NUMERIC, precision, scale, false, propertyGetter, new BigDecimalConverter(scale, RoundingMode.HALF_UP));
+    }
+    protected void mapNumeric(String columnName, int precision, int scale, RoundingMode roundingMode, Function<TEntity, BigDecimal> propertyGetter) {
+        mapProperty(columnName, Types.NUMERIC, precision, scale, false, propertyGetter, new BigDecimalConverter(scale, roundingMode));
     }
 
     protected void mapDecimal(String columnName, int precision, int scale, Function<TEntity, BigDecimal> propertyGetter) {
-        mapProperty(columnName, Types.DECIMAL, precision, scale, false, propertyGetter, new BigDecimalConverter(scale));
+        mapProperty(columnName, Types.DECIMAL, precision, scale, false, propertyGetter, new BigDecimalConverter(scale, RoundingMode.HALF_UP));
     }
 
     protected void mapReal(String columnName, Function<TEntity, Float> propertyGetter) {

JSqlServerBulkInsert/src/test/java/de/bytefish/jsqlserverbulkinsert/test/base/TransactionalTestBase.java

@@ -16,7 +16,8 @@ public abstract class TransactionalTestBase {
 
     @Before
     public void setUp() throws Exception {
-        connection = DriverManager.getConnection("jdbc:sqlserver://localhost:1433;databaseName=TestDatabase", "philipp", "test_pwd");
+        //connection = DriverManager.getConnection("jdbc:sqlserver://localhost:1433;databaseName=TestDatabase", "philipp", "test_pwd");
+        connection = DriverManager.getConnection("jdbc:sqlserver://localhost;instanceName=MSSQLSERVER2017;databaseName=TestDatabase;", "philipp", "test_pwd");
 
         onSetUpBeforeTransaction();
         connection.setAutoCommit(false); // Start the Transaction: