Fix Ordinals

Author: Philipp Wagner

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

@@ -123,6 +123,10 @@ 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);
+    }
+
     private void addColumn(String name, int type, boolean isAutoIncrement, Func2<TEntity, Object> propertyGetter)
     {
         // Create the current Column Meta Data:

JSqlServerBulkInsert/src/main/java/de/bytefish/jsqlserverbulkinsert/records/SqlServerRecord.java

@@ -32,34 +32,34 @@ public SqlServerRecord(List<ColumnMetaData> columnMetaData, Object[] values) {
     public Set<Integer> getColumnOrdinals() {
         // Simply return the length of the List:
         return IntStream
-                .range(0, columnMetaData.size())
+                .range(1, columnMetaData.size() + 1)
                 .boxed()
                 .collect(Collectors.toSet());
     }
 
     @Override
     public String getColumnName(int i) {
-        return columnMetaData.get(i).getName();
+        return columnMetaData.get(i-1).getName();
     }
 
     @Override
     public int getColumnType(int i) {
-        return columnMetaData.get(i).getType();
+        return columnMetaData.get(i-1).getType();
     }
 
     @Override
     public int getPrecision(int i) {
-        return columnMetaData.get(i).getPrecision();
+        return columnMetaData.get(i-1).getPrecision();
     }
 
     @Override
     public int getScale(int i) {
-        return columnMetaData.get(i).getScale();
+        return columnMetaData.get(i-1).getScale();
     }
 
     @Override
     public boolean isAutoIncrement(int i) {
-        return columnMetaData.get(i).isAutoIncrement();
+        return columnMetaData.get(i-1).isAutoIncrement();
     }
 
     @Override

JSqlServerBulkInsert/src/test/java/de/bytefish/jsqlserverbulkinsert/IntegrationTest.java

@@ -0,0 +1,87 @@
+// 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;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+public class IntegrationTest extends TransactionalTestBase {
+
+    private class PersonBulkInserter extends SqlServerBulkInsert<Person> {
+
+        public PersonBulkInserter() {
+            super("dbo", "UnitTest");
+
+            mapString("FirstName", Person::getFirstName);
+            mapString("LastName", Person::getLastName);
+            mapDate("BirthDate", Person::getBirthDate);
+        }
+    }
+
+    @Override
+    protected void onSetUpInTransaction() throws Exception {
+        createTable();
+    }
+
+    @Test
+    public void bulkInsertPersonDataTest() throws SQLException {
+        // Create a large list of Persons:
+        List<Person> persons = getPersonList(100000);
+        // Create the BulkInserter:
+        PersonBulkInserter personBulkInserter = new PersonBulkInserter();
+        // Now save all entities of a given stream:
+        personBulkInserter.saveAll(connection, persons.stream());
+        // And assert all have been written to the database:
+        Assert.assertEquals(100000, getRowCount());
+    }
+
+    private List<Person> getPersonList(int numPersons) {
+        List<Person> persons = new ArrayList<>();
+
+        for (int pos = 0; pos < numPersons; pos++) {
+            Person p = new Person();
+
+            p.setFirstName("Philipp");
+            p.setLastName("Wagner");
+            p.setBirthDate(LocalDate.of(1986, 5, 12));
+
+            persons.add(p);
+        }
+
+        return persons;
+    }
+
+    private boolean createTable() throws SQLException {
+
+        String sqlStatement = "CREATE TABLE [dbo].[UnitTest]\n" +
+                "            (\n" +
+                "                FirstName NVARCHAR(255),\n" +
+                "                LastName NVARCHAR(255),\n" +
+                "                BirthDate DATE\n" +
+                "            );";
+
+        Statement statement = connection.createStatement();
+
+        return statement.execute(sqlStatement);
+    }
+
+    private int getRowCount() throws SQLException {
+
+        Statement s = connection.createStatement();
+
+        ResultSet r = s.executeQuery("SELECT COUNT(*) AS rowcount FROM [dbo].[UnitTest]");
+        r.next();
+        int count = r.getInt("rowcount");
+        r.close();
+
+        return count;
+    }
+}

JSqlServerBulkInsert/src/test/java/de/bytefish/jsqlserverbulkinsert/Person.java

@@ -0,0 +1,42 @@
+// 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;
+
+import java.time.LocalDate;
+
+public class Person {
+
+    private String firstName;
+
+    private String lastName;
+
+    private LocalDate birthDate;
+
+    public Person() {
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public LocalDate getBirthDate() {
+        return birthDate;
+    }
+
+    public void setBirthDate(LocalDate birthDate) {
+        this.birthDate = birthDate;
+    }
+}

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

@@ -0,0 +1,43 @@
+// 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;
+
+
+import org.junit.After;
+import org.junit.Before;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+public abstract class TransactionalTestBase {
+
+    protected Connection connection;
+
+    @Before
+    public void setUp() throws Exception {
+        connection = DriverManager.getConnection("jdbc:sqlserver://localhost:1433;databaseName=TestDatabase", "philipp", "test_pwd");
+
+        onSetUpBeforeTransaction();
+        connection.setAutoCommit(false); // Start the Transaction:
+        onSetUpInTransaction();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+        onTearDownInTransaction();
+        connection.rollback();
+        onTearDownAfterTransaction();
+
+        connection.close();
+    }
+
+    protected void onSetUpInTransaction() throws Exception {}
+
+    protected void onSetUpBeforeTransaction() throws Exception {}
+
+    protected void onTearDownInTransaction() throws Exception {}
+
+    protected void onTearDownAfterTransaction() throws Exception {}
+}