bugfix: extrac columns only when SELECT/DELETE/INSERT/UPDATE statements (i.e., ignore CALL next value-like statements)

Author: jgaleotti

client-java/sql/src/main/java/org/evomaster/client/java/sql/internal/SqlHandler.java

@@ -150,15 +150,21 @@ public void handle(SqlExecutionLogDto sqlExecutionLogDto) {
 
     private void mergeNewDataForCompleteSqlHeuristics(String sqlCommand) {
         Statement parsedSqlCommand = SqlParserUtils.parseSqlCommand(sqlCommand);
-        Map<SqlTableId, Set<SqlColumnId>> columns = extractColumnsInvolvedInStatement(parsedSqlCommand);
-        if (parsedSqlCommand instanceof Select) {
-            mergeNewData(queriedData, columns);
-        } else if (parsedSqlCommand instanceof Delete) {
-            deletedData.addAll(columns.keySet());
-        } else if (parsedSqlCommand instanceof Insert) {
-            mergeNewData(insertedData, columns);
-        } else if (parsedSqlCommand instanceof Update) {
-            mergeNewData(updatedData, columns);
+        if (parsedSqlCommand instanceof Select
+                || parsedSqlCommand instanceof Delete
+                || parsedSqlCommand instanceof Insert
+                || parsedSqlCommand instanceof Update) {
+
+            Map<SqlTableId, Set<SqlColumnId>> columns = extractColumnsInvolvedInStatement(parsedSqlCommand);
+            if (parsedSqlCommand instanceof Select) {
+                mergeNewData(queriedData, columns);
+            } else if (parsedSqlCommand instanceof Delete) {
+                deletedData.addAll(columns.keySet());
+            } else if (parsedSqlCommand instanceof Insert) {
+                mergeNewData(insertedData, columns);
+            } else if (parsedSqlCommand instanceof Update) {
+                mergeNewData(updatedData, columns);
+            }
         }
     }
 

client-java/sql/src/test/java/org/evomaster/client/java/sql/internal/SqlHandlerTest.java

@@ -8,6 +8,8 @@
 import org.evomaster.client.java.controller.api.dto.database.schema.TableDto;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.sql.*;
 import java.util.Collections;
@@ -196,6 +198,22 @@ private static ColumnDto createColumnDto(String tableName, String columnName) {
         return schema;
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = {false, true})
+    public void testCallNextValue(boolean isCompleteSqlHeuristics) {
+
+        String sqlCommand = "CALL next value for hibernate_sequence";
+        SqlHandler sqlHandler = new SqlHandler(null);
+        sqlHandler.setCalculateHeuristics(true);
+        sqlHandler.setCompleteSqlHeuristics(isCompleteSqlHeuristics);
+
+        SqlExecutionLogDto sqlExecutionLogDto = new SqlExecutionLogDto();
+        sqlExecutionLogDto.sqlCommand = sqlCommand;
+        sqlExecutionLogDto.threwSqlExeception = false;
+
+        sqlHandler.handle(sqlExecutionLogDto);
+    }
+
     private static @NotNull Connection createMockConnectionForSimpleSelect() throws SQLException {
         Connection mockConnection = mock(Connection.class);
         ResultSet mockEmployeeResultSet = mock(ResultSet.class);