Update SqlServer JDBC Driver

Author: bytefish

JSqlServerBulkInsert/jsqlserverbulkinsert.iml

@@ -155,7 +155,7 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>6.4.0.jre8</version>
+            <version>7.2.2.jre8</version>
         </dependency>
 
         <dependency>

JSqlServerBulkInsert/pom.xml

@@ -41,6 +41,24 @@ protected void mapBoolean(String columnName, Func2<TEntity, Boolean> propertyGet
         addColumn(columnName, Types.BIT, propertyGetter);
     }
 
+    // region Text Functions
+
+    protected void mapChar(String columnName, Func2<TEntity, Character> propertyGetter) {
+        addColumn(columnName, Types.CHAR, propertyGetter);
+    }
+
+    protected void mapVarchar(String columnName, Func2<TEntity, String> propertyGetter) {
+        addColumn(columnName, Types.VARCHAR, propertyGetter);
+    }
+
+    protected void mapNvarchar(String columnName, Func2<TEntity, String> propertyGetter) {
+        addColumn(columnName, Types.NVARCHAR, propertyGetter);
+    }
+
+    // endregion
+
+    // region Numeric Functions
+
     protected void mapNumeric(String columnName, int precision, int scale, Func2<TEntity, BigDecimal> propertyGetter) {
 
         // We need to scale the incoming decimal, before writing it to SQL Server:
@@ -54,6 +72,7 @@ protected void mapNumeric(String columnName, int precision, int scale, Func2<TEn
             return result;
         };
 
+
         addColumn(columnName, Types.NUMERIC, precision, scale, false, wrapper);
     }
 
@@ -94,6 +113,30 @@ protected void mapBigIntLong(String columnName, Func2<TEntity, Long> propertyGet
         addColumn(columnName, Types.BIGINT, isAutoIncrement, propertyGetter);
     }
 
+    protected void mapDouble(String columnName, Func2<TEntity, Double> propertyGetter)
+    {
+        addColumn(columnName, Types.DOUBLE, propertyGetter);
+    }
+
+    protected void mapInt(String columnName, Func2<TEntity, Integer> propertyGetter, boolean isAutoIncrement)
+    {
+        addColumn(columnName, Types.INTEGER, isAutoIncrement, propertyGetter);
+    }
+
+    protected void mapSmallInt(String columnName, Func2<TEntity, Short> propertyGetter, boolean isAutoIncrement)
+    {
+        addColumn(columnName, Types.SMALLINT, isAutoIncrement, propertyGetter);
+    }
+
+    protected void mapTinyInt(String columnName, Func2<TEntity, Byte> propertyGetter)
+    {
+        addColumn(columnName, Types.TINYINT, propertyGetter);
+    }
+
+    // endregion
+
+    // region Time Functions
+
     protected void mapDate(String columnName, Func2<TEntity, LocalDate> propertyGetter) {
         addColumn(columnName, Types.DATE, propertyGetter);
     }
@@ -134,6 +177,7 @@ protected void mapLocalDateTime(String columnName, Func2<TEntity, LocalDateTime>
     }
 
     protected void mapUTCNano(String dateColumnName, String timeColumnName, Func2<TEntity, Long> propertyGetter) {
+
         // We need to scale the incoming LocalDateTime and cast it to Timestamp so that the scaling sticks, before writing it to SQL Server:
         final Func2<TEntity, Date> dateWrapper = entity -> {
             Long result = propertyGetter.invoke(entity);
@@ -143,6 +187,7 @@ protected void mapUTCNano(String dateColumnName, String timeColumnName, Func2<TE
             AbstractMap.Entry<Long,Integer> convertedDT = convertUTCNanoToEpochSecAndNano(result);
             return new Date(convertedDT.getKey()*1000);
         };
+
         final Func2<TEntity, String> timeWrapper = entity -> {
             Long result = propertyGetter.invoke(entity);
             if (result == null) {
@@ -182,26 +227,6 @@ private static AbstractMap.Entry<Long,Integer> convertUTCNanoToEpochSecAndNano(L
         return new AbstractMap.SimpleEntry<>(epochSeconds, nanoseconds);
     }
 
-    protected void mapDouble(String columnName, Func2<TEntity, Double> propertyGetter)
-    {
-        addColumn(columnName, Types.DOUBLE, propertyGetter);
-    }
-
-    protected void mapInt(String columnName, Func2<TEntity, Integer> propertyGetter, boolean isAutoIncrement)
-    {
-        addColumn(columnName, Types.INTEGER, isAutoIncrement, propertyGetter);
-    }
-
-    protected void mapSmallInt(String columnName, Func2<TEntity, Short> propertyGetter, boolean isAutoIncrement)
-    {
-        addColumn(columnName, Types.SMALLINT, isAutoIncrement, propertyGetter);
-    }
-
-    protected void mapTinyInt(String columnName, Func2<TEntity, Byte> propertyGetter)
-    {
-        addColumn(columnName, Types.TINYINT, propertyGetter);
-    }
-
     protected void mapTimeWithTimeZone(String columnName, Func2<TEntity, OffsetTime> propertyGetter) {
         addColumn(columnName, 2013, propertyGetter);
     }
@@ -210,20 +235,17 @@ protected void mapDateTimeWithTimeZone(String columnName, Func2<TEntity, OffsetD
         addColumn(columnName, 2014, propertyGetter);
     }
 
-    protected void mapString(String columnName, Func2<TEntity, String> propertyGetter) {
-        addColumn(columnName, Types.NVARCHAR, propertyGetter);
-    }
+    // endregion
+
 
     protected void mapVarBinary(String columnName, int maxLength, Func2<TEntity, byte[]> propertyGetter) {
         addColumn(columnName, Types.VARBINARY, maxLength, 0, false, propertyGetter);
     }
 
     private <TProperty> void addColumn(String name, int type, boolean isAutoIncrement, Func2<TEntity, TProperty> propertyGetter)
     {
-        // Create the current Column Meta Data:
         ColumnMetaData columnMetaData = new ColumnMetaData(name, type, 0, 0, isAutoIncrement);
 
-        // Add a new Column with the Meta Data and Property Getter:
         addColumn(columnMetaData, propertyGetter);
     }
 
@@ -242,7 +264,6 @@ private <TProperty> void addColumn(String name, int type, int precision, int sca
         ColumnMetaData columnMetaData = new ColumnMetaData(name, type, precision, scale, isAutoIncrement);
 
         // Add a new Column with the Meta Data and Property Getter:
-
         addColumn(columnMetaData, propertyGetter);
     }
 

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

@@ -8,6 +8,7 @@
 import de.bytefish.jsqlserverbulkinsert.model.ColumnDefinition;
 import de.bytefish.jsqlserverbulkinsert.model.ColumnMetaData;
 
+import java.time.format.DateTimeFormatter;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -24,6 +25,42 @@ public class SqlServerRecord<TEntity> implements ISQLServerBulkRecord {
 
     private final SqlServerRecordBuilder<TEntity> builder;
 
+    @Override
+    public void addColumnMetadata(int positionInSource, String name, int jdbcType, int precision, int scale, DateTimeFormatter dateTimeFormatter) throws SQLServerException {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public void addColumnMetadata(int positionInSource, String name, int jdbcType, int precision, int scale) throws SQLServerException {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public void setTimestampWithTimezoneFormat(String s) {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public void setTimestampWithTimezoneFormat(DateTimeFormatter dateTimeFormatter) {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public void setTimeWithTimezoneFormat(String s) {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public void setTimeWithTimezoneFormat(DateTimeFormatter dateTimeFormatter) {
+        // We can safely ignore ...
+    }
+
+    @Override
+    public DateTimeFormatter getColumnDateTimeFormatter(int i) {
+        // We don't need to implement it ...
+        return null;
+    }
+
     public SqlServerRecord(List<ColumnDefinition<TEntity>> columns, Iterator<TEntity> entities) {
 
         if(columns == null) {