Improve row sorting following primary key values

Author: jeanbisutti

src/main/java/org/stdg/DatasetRowComparatorBuilder.java

@@ -44,27 +44,36 @@ public int compare(DatasetRow datasetRow1, DatasetRow datasetRow2) {
             }
 
             String tableName = datasetRow1.getTableName();
-            List<String> primaryColumns = primaryKeyColumnsFinder.findPrimaryColumnsOf(tableName);
+            List<String> primaryKeyColumns = primaryKeyColumnsFinder.findPrimaryColumnsOf(tableName);
 
-            String primaryKey1 = computePrimaryKeyAsString(datasetRow1, primaryColumns);
-            String primaryKey2 = computePrimaryKeyAsString(datasetRow2, primaryColumns);
+            for (String primaryKeyColumn : primaryKeyColumns) {
+                int intComparison = compareIntPkValues(primaryKeyColumn, datasetRow1, datasetRow2);
+                if(intComparison != 0) {
+                    return intComparison;
+                }
+            }
 
-            return primaryKey1.compareTo(primaryKey2);
+            return 0;
 
         }
 
         private boolean sameTableNames(DatasetRow datasetRow1, DatasetRow datasetRow2) {
             return datasetRow1.getTableName().equals(datasetRow2.getTableName());
         }
 
-        private String computePrimaryKeyAsString(DatasetRow datasetRow1, List<String> primaryColumns) {
-            StringBuilder resultAsStringBuilder = new StringBuilder();
-            for (String primaryColumn : primaryColumns) {
-                Object primaryKeyValue = datasetRow1.getValueOf(primaryColumn);
-                String primaryKeyValueAsString = primaryKeyValue.toString();
-                resultAsStringBuilder.append(primaryKeyValueAsString);
+        private int compareIntPkValues(String primaryKeyColumn, DatasetRow datasetRow1, DatasetRow datasetRow2) {
+            Object pkValue1 = datasetRow1.getValueOf(primaryKeyColumn);
+            Object pkValue2 = datasetRow2.getValueOf(primaryKeyColumn);
+            boolean integerPrimaryKey = pkValue1 instanceof Integer
+                                     || pkValue1 instanceof Long;
+            if(integerPrimaryKey) {
+                Number pkValue1AsNumber = (Number) pkValue1;
+                Number pkValue2AsNumber = (Number) pkValue2;
+                long pkValue1AsLong = pkValue1AsNumber.longValue();
+                long pkValue2AsLong = pkValue2AsNumber.longValue();
+                return Long.compare(pkValue1AsLong, pkValue2AsLong );
             }
-            return resultAsStringBuilder.toString();
+            return 0;
         }
 
     }

src/test/java/org/stdg/test/DatasetRowApiTest.java

@@ -22,7 +22,7 @@
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
 import static org.stdg.test.TestTable.buildUniqueTable;
 
-public class DatasetRowApiTest extends H2Configuration {
+public class DatasetRowApiTest extends H2Config {
 
     @Test public void
     should_generate_working_insert_from_a_dataset_row() {

src/test/java/org/stdg/test/DatasetRowsMergingTest.java

@@ -20,7 +20,7 @@
 
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
 
-public class DatasetRowsMergingTest extends H2Configuration {
+public class DatasetRowsMergingTest extends H2Config {
 
     @Test public void
     should_merge_dataset_rows_if_columns_in_common_have_same_values() {

src/test/java/org/stdg/test/DeleteTest.java

@@ -19,7 +19,7 @@
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
 import static org.stdg.test.TestTable.buildUniqueTable;
 
-public class DeleteTest extends H2Configuration {
+public class DeleteTest extends H2Config {
 
     @Test
     public void

src/test/java/org/stdg/test/FastTestSuite.java

@@ -28,6 +28,7 @@
                  , DeleteTest.class
                  , InsertTest.class
                  , SortInsertStatementsTest.class
+                 , SortInsertStatementsWithPkTest.class
                  , DatasetRowsMergingTest.class
                  , JdbcRoundtripTest.class} )
 public class FastTestSuite {

…/java/org/stdg/test/H2Configuration.java src/test/java/org/stdg/test/H2Config.javasrc/test/java/org/stdg/test/H2Configuration.java renamed to src/test/java/org/stdg/test/H2Config.java src/test/java/org/stdg/test/H2Configuration.java renamed to src/test/java/org/stdg/test/H2Config.java

@@ -21,7 +21,7 @@
 import static org.quickperf.sql.config.QuickPerfSqlDataSourceBuilder.aDataSourceBuilder;
 
 @QuickPerfTest
-class H2Configuration {
+class H2Config {
 
    static DataSource DATA_SOURCE;
 

src/test/java/org/stdg/test/H2Test.java

@@ -22,7 +22,7 @@
 import static org.stdg.test.TestTable.*;
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
 
-public class H2Test extends H2Configuration {
+public class H2Test extends H2Config {
 
     @Test public void
     should_generate_an_insert_statement_with_columns_declared_in_the_same_order_as_in_the_table() {

src/test/java/org/stdg/test/HsqlDbTest.java

@@ -14,6 +14,8 @@
 package org.stdg.test;
 
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.stdg.SqlTestDataGenerator;
 
 import javax.sql.DataSource;
@@ -22,6 +24,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
+import static org.stdg.test.TestTable.buildUniqueTable;
 
 public class HsqlDbTest {
 
@@ -225,8 +228,46 @@ private int generateRandomPositiveInt() {
 
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {"INT", "TINYINT", "SMALLINT",  "BIGINT"})
+    public void
+    should_sort_insert_statements_following_an_integer_primary_key(String intType) {
+
+        TestTable table =
+                buildUniqueTable(DATA_SOURCE
+                                , "table_with_int_pk"
+                                , "col_id " + intType + "," +
+                                "colA  varchar(20), " +
+                                "colB  varchar(20), " +
+                                "constraint int_pk" + generateRandomPositiveInt() + " primary key (col_id)"
+                                )
+                .create()
+                .insertValues("2, 'A', 'B'")
+                .insertValues("10, 'C', 'D'")
+                .insertValues("1, 'E', 'F'");
+
+        String selectAll = "SELECT * FROM " + table.getTableName();
+        SqlTestDataGenerator sqlTestDataGenerator = SqlTestDataGenerator.buildFrom(DATA_SOURCE);
+
+        // WHEN
+        List<String> insertStatements = sqlTestDataGenerator.generateInsertListFor(selectAll);
+
+        // THEN
+        String insertStatementsAsString = insertStatements.toString();
+
+        String firstQuery = insertStatements.get(0);
+        assertThat(firstQuery).as(insertStatementsAsString).contains("VALUES(1");
+
+        String secondQuery = insertStatements.get(1);
+        assertThat(secondQuery).as(insertStatementsAsString).contains("VALUES(2");
+
+        String thirdQuery = insertStatements.get(2);
+        assertThat(thirdQuery).as(insertStatementsAsString).contains("VALUES(10");
+
+    }
+
     @RepeatedTest(9) public void
-    should_sort_insert_statements_following_the_primary_key_values() {
+    should_sort_insert_statements_following_a_composite_primary_key() {
 
         // GIVEN
         TestTable table =

src/test/java/org/stdg/test/InsertTest.java

@@ -19,7 +19,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class InsertTest extends H2Configuration {
+public class InsertTest extends H2Config {
 
     @Test public void
     should_generate_an_empty_insert_script_for_an_insert_input() {

src/test/java/org/stdg/test/JdbcRoundtripTest.java

@@ -23,7 +23,7 @@
 
 import static org.stdg.test.TestTable.TestTableAssert.assertThat;
 
-public class JdbcRoundtripTest extends H2Configuration {
+public class JdbcRoundtripTest extends H2Config {
 
     private TestTable t1Table;
     private TestTable t2Table;