Fix Nanosecond Precision Test

Author: bytefish

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

@@ -11,6 +11,8 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.AbstractMap;
 import java.util.function.Function;
 
@@ -44,12 +46,15 @@ public static <TEntity> void mapUTCNano(AbstractMapping<TEntity> mapping, String
             @Override
             public Object internalConvert(Long value) {
 
-                AbstractMap.SimpleImmutableEntry<Long, Integer> convertedDT = TimestampUtils.convertUtcNanoToEpochSecAndNano(value);
+                // loses subsecond data:
+                long seconds = value / 1000000000;
+                int nanoseconds = (int) (value - (seconds * 1000000000));
 
-                Timestamp castedResult = new Timestamp(convertedDT.getKey() * 1000);
-                castedResult.setNanos(convertedDT.getValue());
+                // Round to 100 nanoseconds (precision that SQL server can handle):
+                nanoseconds = (nanoseconds / 100) * 100;
 
-                return castedResult;
+                // Must include this adjustment to counteract the timezone adjustment that the SQL Server JDBC driver makes:
+                return LocalDateTime.ofEpochSecond(seconds, nanoseconds, ZoneOffset.UTC);
             }
         });
     }

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

@@ -91,17 +91,17 @@ protected <TProperty>  void mapNull(String columnName, Function<TEntity, TProper
 
     protected void mapTinyInt(String columnName, Function<TEntity, Byte> propertyGetter)
     {
-        mapProperty(columnName, Types.TINYINT, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.TINYINT, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapSmallInt(String columnName, Function<TEntity, Short> propertyGetter)
     {
-        mapProperty(columnName, Types.SMALLINT, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.SMALLINT, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapSmallInt(String columnName, boolean isAutoIncrement)
     {
-        mapProperty(columnName, Types.SMALLINT, 0, 0, isAutoIncrement, (entity) -> null, new IdentityConverter());
+        mapProperty(columnName, Types.SMALLINT, 0, 0, isAutoIncrement, (entity) -> null, new IdentityConverter<>());
     }
 
     protected void mapInteger(String columnName, Function<TEntity, Integer> propertyGetter)
@@ -111,24 +111,24 @@ protected void mapInteger(String columnName, Function<TEntity, Integer> property
 
     protected void mapInteger(String columnName, boolean isAutoIncrement)
     {
-        mapProperty(columnName, Types.INTEGER, 0, 0, isAutoIncrement, (entity) -> null, new IdentityConverter());
+        mapProperty(columnName, Types.INTEGER, 0, 0, isAutoIncrement, (entity) -> null, new IdentityConverter<>());
     }
 
     protected void mapIntegerPrimitive(String columnName, ToIntFunction<TEntity> propertyGetter)
     {
-        mapProperty(columnName, Types.INTEGER, (entity) -> propertyGetter.applyAsInt(entity), new IdentityConverter());
+        mapProperty(columnName, Types.INTEGER, propertyGetter::applyAsInt, new IdentityConverter<>());
     }
 
     protected void mapLong(String columnName, Function<TEntity, Long> propertyGetter) {
-        mapProperty(columnName, Types.BIGINT, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.BIGINT, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapLong(String columnName, boolean isAutoIncrement) {
         mapProperty(columnName, Types.BIGINT, 0, 0, isAutoIncrement, (entity) -> null, new IdentityConverter());
     }
 
     protected void mapLongPrimitive(String columnName, ToLongFunction<TEntity> propertyGetter) {
-        mapProperty(columnName, Types.BIGINT,  (entity) -> propertyGetter.applyAsLong(entity), new IdentityConverter());
+        mapProperty(columnName, Types.BIGINT,  (entity) -> propertyGetter.applyAsLong(entity), new IdentityConverter<>());
     }
 
     protected void mapNumeric(String columnName, int precision, int scale, Function<TEntity, BigDecimal> propertyGetter) {
@@ -143,60 +143,55 @@ protected void mapDecimal(String columnName, int precision, int scale, Function<
     }
 
     protected void mapReal(String columnName, Function<TEntity, Float> propertyGetter) {
-        mapProperty(columnName, Types.REAL, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.REAL, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapRealPrimitive(String columnName, ToFloatFunction<TEntity> propertyGetter) {
-        mapProperty(columnName, Types.REAL, (entity) -> propertyGetter.applyAsFloat(entity), new IdentityConverter());
+        mapProperty(columnName, Types.REAL, propertyGetter::applyAsFloat, new IdentityConverter<>());
     }
 
     protected void mapBigInt(String columnName, Function<TEntity, BigInteger> propertyGetter) {
         mapProperty(columnName, Types.BIGINT, propertyGetter, new BigIntegerConverter());
     }
 
     protected void mapDouble(String columnName, Function<TEntity, Double> propertyGetter) {
-        mapProperty(columnName, Types.DOUBLE, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.DOUBLE, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapDoublePrimitive(String columnName, ToDoubleFunction<TEntity> propertyGetter) {
-        mapProperty(columnName, Types.DOUBLE, (entity) -> propertyGetter.applyAsDouble(entity), new IdentityConverter());
+        mapProperty(columnName, Types.DOUBLE, propertyGetter::applyAsDouble, new IdentityConverter<>());
     }
 
     // endregion
 
     // region Time Functions
 
     protected void mapDate(String columnName, Function<TEntity, LocalDate> propertyGetter) {
-        mapProperty(columnName, Types.DATE, propertyGetter, new IdentityConverter());
-    }
-
-    protected void mapInstant(String columnName, Function<TEntity, Instant> propertyGetter) {
-
-        mapProperty(columnName, Types.TIMESTAMP, propertyGetter, new InstantConverter());
+        mapProperty(columnName, Types.DATE, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapDateTime(String columnName, Function<TEntity, Timestamp> propertyGetter) {
-        mapProperty(columnName, Types.TIMESTAMP, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.TIMESTAMP, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapLocalDateTime(String columnName, Function<TEntity, LocalDateTime> propertyGetter) {
-        mapProperty(columnName, Types.TIMESTAMP, propertyGetter, new LocalDateTimeConverter());
+        mapProperty(columnName, Types.TIMESTAMP, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapTimeWithTimeZone(String columnName, Function<TEntity, OffsetTime> propertyGetter) {
-        mapProperty(columnName, SqlServerTypes.TimeWithTimeZone, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, SqlServerTypes.TimeWithTimeZone, propertyGetter, new IdentityConverter<>());
     }
 
     protected void mapDateTimeWithTimeZone(String columnName, Function<TEntity, OffsetDateTime> propertyGetter) {
-        mapProperty(columnName, SqlServerTypes.DateTimeWithTimeZone, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, SqlServerTypes.DateTimeWithTimeZone, propertyGetter, new IdentityConverter<>());
     }
 
     // endregion
 
     // region Binary
 
     protected void mapVarBinary(String columnName, int maxLength, Function<TEntity, byte[]> propertyGetter) {
-        mapProperty(columnName, Types.VARBINARY, maxLength, 0, false, propertyGetter, new IdentityConverter());
+        mapProperty(columnName, Types.VARBINARY, maxLength, 0, false, propertyGetter, new IdentityConverter<>());
     }
 
     // endregion

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/extensions/DateTimeExtensions.java

@@ -16,8 +16,12 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.List;
+import java.util.TimeZone;
 
 public class LocalDateMappingTest extends TransactionalTestBase {
 
@@ -65,17 +69,17 @@ public void bulkInsertPersonDataTest() throws SQLException {
         while (rs.next()) {
 
             // Get the Date we have written:
-            Date date = rs.getDate("LocalDate");
+            LocalDate date = rs.getTimestamp("LocalDate", Calendar.getInstance(TimeZone.getTimeZone("UTC")))
+                    .toInstant()
+                    .atZone(ZoneOffset.UTC)
+                    .toLocalDate();
 
             // We should have a date:
             Assert.assertNotNull(date);
 
-            // Get the LocalDate:
-            LocalDate resultDate = date.toLocalDate();
-
-            Assert.assertEquals(localDate.getYear(), resultDate.getYear());
-            Assert.assertEquals(localDate.getMonthValue(), resultDate.getMonthValue());
-            Assert.assertEquals(localDate.getDayOfMonth(), resultDate.getDayOfMonth());
+            Assert.assertEquals(localDate.getYear(), date.getYear());
+            Assert.assertEquals(localDate.getMonthValue(), date.getMonthValue());
+            Assert.assertEquals(localDate.getDayOfMonth(), date.getDayOfMonth());
         }
     }