Fix Boolean Handler

Author: Philipp Wagner

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/SqlServerBulkInsert.java

@@ -70,12 +70,20 @@ public void internalWriteToServer(SQLServerBulkCopy sqlServerBulkCopy, ISQLServe
     }
 
     protected void mapBoolean(String columnName, Func2<TEntity, Boolean> propertyGetter) {
-        addColumn(columnName, Types.BOOLEAN, propertyGetter);
+        addColumn(columnName, Types.BIT, propertyGetter);
     }
 
-    protected void mapNumeric(String columnName, int scale, int precision, Func2<TEntity, BigDecimal> propertyGetter)
-    {
-        addColumn(columnName, Types.NUMERIC, precision, scale, false, propertyGetter);
+    protected void mapNumeric(String columnName, int scale, int precision, Func2<TEntity, BigDecimal> propertyGetter) {
+        // We need to scale the incoming decimal, before writing it to SQL Server:
+        final Func2<TEntity, BigDecimal> wrapper = entity -> {
+            BigDecimal result = propertyGetter
+                    .invoke(entity)
+                    .setScale(10, BigDecimal.ROUND_HALF_UP);
+
+            return result;
+        };
+
+        addColumn(columnName, Types.NUMERIC, precision, scale, false, wrapper);
     }
 
     protected void mapDecimal(String columnName, int precision, int scale, Func2<TEntity, BigDecimal> propertyGetter)

JSqlServerBulkInsert/src/test/java/de/bytefish/jsqlserverbulkinsert/test/mapping/BooleanMappingTest.java

@@ -0,0 +1,82 @@
+// Copyright (c) Philipp Wagner. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.test.mapping;
+
+import de.bytefish.jsqlserverbulkinsert.SqlServerBulkInsert;
+import de.bytefish.jsqlserverbulkinsert.test.base.TransactionalTestBase;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+
+public class BooleanMappingTest extends TransactionalTestBase {
+
+    private class BooleanEntity extends SampleEntity<Boolean> {
+
+        public BooleanEntity(Boolean value) {
+            super(value);
+        }
+    }
+
+    private class BooleanInsert extends SqlServerBulkInsert<BooleanEntity> {
+
+        public BooleanInsert() {
+            super("dbo", "UnitTest");
+
+            mapBoolean("BooleanValue", BooleanEntity::getValue);
+        }
+
+    }
+
+    @Override
+    protected void onSetUpInTransaction() throws Exception {
+        createTestTable();
+    }
+
+    @Test
+    public void bulkInsertPersonDataTest() throws SQLException {
+        boolean booleanValue = true;
+        // Create the Value:
+        List<BooleanEntity> entities = Arrays.asList(new BooleanEntity(booleanValue));
+        // Create the BulkInserter:
+        BooleanInsert localDateInsert = new BooleanInsert();
+        // Now save all entities of a given stream:
+        localDateInsert.saveAll(connection, entities.stream());
+        // And assert all have been written to the database:
+        ResultSet rs = getAll();
+        // We have a Value:
+        Assert.assertEquals(true, rs.next());
+        // Get the Date we have written:
+        boolean resultBooleanValue = rs.getBoolean("BooleanValue");
+        // Assert both are equal:
+        Assert.assertEquals(booleanValue, resultBooleanValue);
+        // Assert only one record was read:
+        Assert.assertEquals(false, rs.next());
+    }
+
+    private ResultSet getAll() throws SQLException {
+
+        String sqlStatement = "SELECT * FROM dbo.UnitTest";
+
+        Statement statement = connection.createStatement();
+
+        return statement.executeQuery(sqlStatement);
+    }
+
+    private void createTestTable() throws SQLException {
+        String sqlStatement = "CREATE TABLE [dbo].[UnitTest]\n" +
+                "            (\n" +
+                "                BooleanValue BIT\n" +
+                "            );";
+
+        Statement statement = connection.createStatement();
+
+        statement.execute(sqlStatement);
+    }
+
+}

JSqlServerBulkInsert/src/test/java/de/bytefish/jsqlserverbulkinsert/test/mapping/RealMappingTest.java

@@ -0,0 +1,83 @@
+// Copyright (c) Philipp Wagner. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package de.bytefish.jsqlserverbulkinsert.test.mapping;
+
+import de.bytefish.jsqlserverbulkinsert.SqlServerBulkInsert;
+import de.bytefish.jsqlserverbulkinsert.test.base.TransactionalTestBase;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+
+public class RealMappingTest extends TransactionalTestBase {
+
+    private class FloatEntity extends SampleEntity<Float> {
+
+        public FloatEntity(Float value) {
+            super(value);
+        }
+    }
+
+    private class BigDecimalInsert extends SqlServerBulkInsert<FloatEntity> {
+
+        public BigDecimalInsert() {
+            super("dbo", "UnitTest");
+
+            mapReal("FloatValue", FloatEntity::getValue);
+        }
+
+    }
+
+    @Override
+    protected void onSetUpInTransaction() throws Exception {
+        createTestTable();
+    }
+
+    @Test
+    public void bulkInsertPersonDataTest() throws SQLException {
+        float floatValue = 123.123f;
+        // Create the Value:
+        List<FloatEntity> entities = Arrays.asList(new FloatEntity(floatValue));
+        // Create the BulkInserter:
+        BigDecimalInsert localDateInsert = new BigDecimalInsert();
+        // Now save all entities of a given stream:
+        localDateInsert.saveAll(connection, entities.stream());
+        // And assert all have been written to the database:
+        ResultSet rs = getAll();
+        // We have a Value:
+        Assert.assertEquals(true, rs.next());
+        // Get the Date we have written:
+        float resultFloatValue = rs.getFloat("FloatValue");
+        // Assert both are equal:
+        Assert.assertEquals(floatValue, resultFloatValue, 1e-10);
+        // Assert only one record was read:
+        Assert.assertEquals(false, rs.next());
+    }
+
+    private ResultSet getAll() throws SQLException {
+
+        String sqlStatement = "SELECT * FROM dbo.UnitTest";
+
+        Statement statement = connection.createStatement();
+
+        return statement.executeQuery(sqlStatement);
+    }
+
+    private void createTestTable() throws SQLException {
+        String sqlStatement = "CREATE TABLE [dbo].[UnitTest]\n" +
+                "            (\n" +
+                "                FloatValue FLOAT\n" +
+                "            );";
+
+        Statement statement = connection.createStatement();
+
+        statement.execute(sqlStatement);
+    }
+
+}