Fix the formatting of the comments that are printed when PQS detects a bug

mrigger · mrigger · commit fa403d6abfe5 · 2020-08-27T22:37:04.000+02:00
diff --git a/src/sqlancer/Main.java b/src/sqlancer/Main.java
@@ -229,11 +229,7 @@ private void printState(FileWriter writer, StateToReproduce state) {
             sb.append("-- Database version: " + state.getDatabaseVersion() + "\n");
             sb.append("-- seed value: " + state.getSeedValue() + "\n");
             for (Query s : state.getStatements()) {
-                if (s.getQueryString().endsWith(";")) {
-                    sb.append(s.getQueryString());
-                } else {
-                    sb.append(s.getQueryString() + ";");
-                }
+                sb.append(s.getQueryString());
                 sb.append('\n');
             }
             try {
diff --git a/src/sqlancer/common/oracle/PivotedQuerySynthesisBase.java b/src/sqlancer/common/oracle/PivotedQuerySynthesisBase.java
@@ -17,7 +17,7 @@ public abstract class PivotedQuerySynthesisBase<S extends GlobalState<?, ?>, R e
     protected final ExpectedErrors errors = new ExpectedErrors();
 
     /**
-     * The predicates used in WHERE and JOIN clauses, which yield TRUE for the pivot row
+     * The predicates used in WHERE and JOIN clauses, which yield TRUE for the pivot row.
      */
     protected final List<E> rectifiedPredicates = new ArrayList<>();
     protected final S globalState;
@@ -66,11 +66,11 @@ private boolean containsRows(Query query) throws SQLException {
     }
 
     protected void reportMissingPivotRow(Query query) {
-        globalState.getState().getLocalState().log("-- " + "pivot row values:\n");
+        globalState.getState().getLocalState().log("-- pivot row values:");
         String expectedPivotRowString = pivotRow.asStringGroupedByTables();
         globalState.getState().getLocalState().log(expectedPivotRowString);
 
-        StringBuilder sb = new StringBuilder("-- rectified predicates and their expected values:\n");
+        StringBuilder sb = new StringBuilder("--\n-- rectified predicates and their expected values:\n");
         for (E rectifiedPredicate : rectifiedPredicates) {
             sb.append("--");
             sb.append(getExpectedValues(rectifiedPredicate).replace("\n", "\n-- "));
diff --git a/src/sqlancer/common/schema/AbstractRowValue.java b/src/sqlancer/common/schema/AbstractRowValue.java
@@ -58,16 +58,22 @@ public String asStringGroupedByTables() {
         List<C> columnList = getValues().keySet().stream().collect(Collectors.toList());
         List<AbstractTable<?, ?>> tableList = columnList.stream().map(c -> c.getTable()).distinct().sorted()
                 .collect(Collectors.toList());
-        for (AbstractTable<?, ?> t : tableList) {
+        for (int j = 0; j < tableList.size(); j++) {
+            if (j != 0) {
+                sb.append("\n");
+            }
+            AbstractTable<?, ?> t = tableList.get(j);
             sb.append("-- " + t.getName() + "\n");
             List<C> columnsForTable = columnList.stream().filter(c -> c.getTable().equals(t))
                     .collect(Collectors.toList());
-            for (C c : columnsForTable) {
+            for (int i = 0; i < columnsForTable.size(); i++) {
+                if (i != 0) {
+                    sb.append("\n");
+                }
                 sb.append("--\t");
-                sb.append(c);
+                sb.append(columnsForTable.get(i));
                 sb.append("=");
-                sb.append(getValues().get(c));
-                sb.append("\n");
+                sb.append(getValues().get(columnsForTable.get(i)));
             }
         }
         return sb.toString();
