prevent printing last query on error log twice

nukoyluoglu · nukoyluoglu · commit 0bfeed32990c · 2020-07-16T12:51:42.000+03:00
diff --git a/src/sqlancer/ComparatorHelper.java b/src/sqlancer/ComparatorHelper.java
@@ -89,8 +89,6 @@ public static void assumeResultSetsAreEqual(List<String> resultSet, List<String>
             String firstQueryString = String.format(queryFormatString, originalQueryString, resultSet.size());
             String secondQueryString = String.format(queryFormatString,
                     combinedString.stream().collect(Collectors.joining(";")), secondResultSet.size());
-            state.getState().statements.add(new QueryAdapter(firstQueryString));
-            state.getState().statements.add(new QueryAdapter(secondQueryString));
             state.getState().queryString = String.format("%s\n%s", firstQueryString, secondQueryString);
             String assertionMessage = String.format("the size of the result sets mismatch (%d and %d)!\n%s\n%s",
                     resultSet.size(), secondResultSet.size(), firstQueryString, secondQueryString);
diff --git a/src/sqlancer/postgres/oracle/PostgresNoRECOracle.java b/src/sqlancer/postgres/oracle/PostgresNoRECOracle.java
@@ -81,8 +81,6 @@ public void check() throws SQLException {
             String queryFormatString = "%s; -- count: %d";
             String firstQueryStringWithCount = String.format(queryFormatString, firstQueryString, firstCount);
             String secondQueryStringWithCount = String.format(queryFormatString, secondQueryString, secondCount);
-            state.statements.add(new QueryAdapter(firstQueryStringWithCount));
-            state.statements.add(new QueryAdapter(secondQueryStringWithCount));
             state.queryString = String.format("%s\n%s", firstQueryStringWithCount, secondQueryStringWithCount);
             String assertionMessage = String.format("the counts mismatch (%d and %d)!\n%s\n%s", firstCount, secondCount, firstQueryStringWithCount, secondQueryStringWithCount);
             throw new AssertionError(assertionMessage);
diff --git a/src/sqlancer/postgres/oracle/PostgresPivotedQuerySynthesisOracle.java b/src/sqlancer/postgres/oracle/PostgresPivotedQuerySynthesisOracle.java
@@ -58,7 +58,6 @@ public void check() throws SQLException {
 
         boolean isContainedIn = isContainedIn(queryString, options, logger);
         if (!isContainedIn) {
-            state.statements.add(new QueryAdapter(queryString));
             String assertionMessage = String.format("the query doesn't contain at least 1 row!\n%s", queryString);
             throw new AssertionError(assertionMessage);
         }
diff --git a/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java b/src/sqlancer/postgres/oracle/tlp/PostgresTLPAggregateOracle.java
@@ -66,8 +66,6 @@ public void check() throws SQLException {
         String queryFormatString = "--%s;\n-- result: %s";
         String firstQueryString = String.format(queryFormatString, originalQuery, firstResult);
         String secondQueryString = String.format(queryFormatString, metamorphicQuery, secondResult);
-        state.getState().statements.add(new QueryAdapter(firstQueryString));
-        state.getState().statements.add(new QueryAdapter(secondQueryString));
         state.getState().queryString = String.format("%s\n%s", firstQueryString, secondQueryString);
         if (firstResult == null && secondResult != null
                 || firstResult != null && (!firstResult.contentEquals(secondResult)

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ public void check() throws SQLException {`
`58`	`58`
`59`	`59`	`boolean isContainedIn = isContainedIn(queryString, options, logger);`
`60`	`60`	`if (!isContainedIn) {`
`61`		`- state.statements.add(new QueryAdapter(queryString));`
`62`	`61`	`String assertionMessage = String.format("the query doesn't contain at least 1 row!\n%s", queryString);`
`63`	`62`	`throw new AssertionError(assertionMessage);`
`64`	`63`	`}`