Merge branch 'master' into ssrf-test-assertions

Author: seran

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/SutController.java

@@ -33,7 +33,7 @@
 import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.evomaster.client.java.sql.SqlScriptRunnerCached;
 import org.evomaster.client.java.sql.DbSpecification;
-import org.evomaster.client.java.controller.internal.db.MongoHandler;
+import org.evomaster.client.java.controller.internal.db.mongo.MongoHandler;
 import org.evomaster.client.java.sql.DbInfoExtractor;
 import org.evomaster.client.java.sql.internal.SqlHandler;
 import org.evomaster.client.java.controller.mongo.MongoScriptRunner;

…nternal/db/MongoCommandWithDistance.java …l/db/mongo/MongoCommandWithDistance.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoCommandWithDistance.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoCommandWithDistance.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoCommandWithDistance.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoCommandWithDistance.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 public class MongoCommandWithDistance {
 

…nternal/db/MongoDistanceWithMetrics.java …l/db/mongo/MongoDistanceWithMetrics.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetrics.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetrics.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetrics.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetrics.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 public class MongoDistanceWithMetrics {
 

…controller/internal/db/MongoHandler.java …ller/internal/db/mongo/MongoHandler.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoHandler.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandler.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoHandler.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandler.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoFailedQuery;
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoExecutionsDto;

…nal/db/MongoDistanceWithMetricsTest.java …/mongo/MongoDistanceWithMetricsTest.javaclient-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetricsTest.java renamed to client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetricsTest.java client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetricsTest.java renamed to client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetricsTest.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 import org.junit.jupiter.api.Test;
 

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandlerTest.java

@@ -3,8 +3,6 @@
 import com.mongodb.client.*;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.evomaster.client.java.controller.internal.db.MongoHandler;
-import org.evomaster.client.java.controller.internal.db.MongoCommandWithDistance;
 import org.evomaster.client.java.instrumentation.MongoFindCommand;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;

core/src/main/kotlin/org/evomaster/core/sql/SqlInsertBuilder.kt

@@ -1029,9 +1029,9 @@ class SqlInsertBuilder(
      */
     fun extractFkTable(tables: Set<TableId>, all: MutableSet<TableId> = mutableSetOf()): Set<TableId> {
         tables.forEach { t ->
-            if (!all.contains(t))
+            if (!all.contains(t) && all.none { it.isEquivalentIgnoringCase(t) })
                 all.add(t)
-            val fk = extractFkTable(t).filterNot { all.contains(it) }.toSet()
+            val fk = extractFkTable(t).filter { !all.contains(it) && all.none { a -> a.isEquivalentIgnoringCase(it)}}.toSet()
             if (fk.isNotEmpty()) {
                 extractFkTable(fk, all)
             }