sql-multidb-v3

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/InitSqlScriptWithSmartDbCleanTest.java

@@ -39,13 +39,17 @@ default String getInitSqlScript() {
 
     @Test
     default void testAccessedFkClean() throws Exception {
-        EMSqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Bar(id INT Primary Key, valueColumn INT)", true);
-        EMSqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Foo(id INT Primary Key, valueColumn INT, refer_foo INT DEFAULT NULL, bar_id INT, " +
+        EMSqlScriptRunner.execCommand(getConnection(),
+                "CREATE TABLE Bar(id INT Primary Key, valueColumn INT)", true);
+        EMSqlScriptRunner.execCommand(getConnection(),
+                "CREATE TABLE Foo(id INT Primary Key, valueColumn INT, refer_foo INT DEFAULT NULL, bar_id INT, " +
                 "CONSTRAINT fk_foo FOREIGN KEY (bar_id) REFERENCES Bar(id)," +
                 "CONSTRAINT fk_self_foo FOREIGN KEY (refer_foo) REFERENCES Foo(id) )", true);
-        EMSqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Abc(id INT Primary Key, valueColumn INT, foo_id INT, " +
+        EMSqlScriptRunner.execCommand(getConnection(),
+                "CREATE TABLE Abc(id INT Primary Key, valueColumn INT, foo_id INT, " +
                 "CONSTRAINT fk_abc FOREIGN KEY (foo_id) REFERENCES Foo(id) )", true);
-        EMSqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Xyz(id INT Primary Key, valueColumn INT, abc_id INT, " +
+        EMSqlScriptRunner.execCommand(getConnection(),
+                "CREATE TABLE Xyz(id INT Primary Key, valueColumn INT, abc_id INT, " +
                 "CONSTRAINT fk_xyz FOREIGN KEY (abc_id) REFERENCES Abc(id) )", true);
 
         InstrumentedSutStarter starter = getInstrumentedSutStarter();

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/h2/DatabaseFakeH2SutController.java

@@ -52,7 +52,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
     @Override
     public String startSut() {
         running = true;
-        DbCleaner.clearDatabase(sqlConnection, null, DatabaseType.H2);
+        DbCleaner.clearDatabase_H2(sqlConnection, null, null);
         return "foo";
     }
 

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/h2/H2SchemaExtractorTest.java

@@ -32,7 +32,7 @@ public void testBasic() throws Exception {
         assertAll(() -> assertEquals("db_test", schema.name.toLowerCase()),
                 () -> assertEquals(DatabaseType.H2, schema.databaseType),
                 () -> assertEquals(1, schema.tables.size()),
-                () -> assertEquals("foo", schema.tables.get(0).name.toLowerCase()),
+                () -> assertEquals("foo", schema.tables.get(0).id.name.toLowerCase()),
                 () -> assertEquals(1, schema.tables.get(0).columns.size())
         );
     }
@@ -45,8 +45,8 @@ public void testTwoTables() throws Exception {
         assertNotNull(schema);
 
         assertEquals(2, schema.tables.size());
-        assertTrue(schema.tables.stream().map(t -> t.name.toLowerCase()).anyMatch(n -> n.equals("foo")));
-        assertTrue(schema.tables.stream().map(t -> t.name.toLowerCase()).anyMatch(n -> n.equals("bar")));
+        assertTrue(schema.tables.stream().map(t -> t.id.name.toLowerCase()).anyMatch(n -> n.equals("foo")));
+        assertTrue(schema.tables.stream().map(t -> t.id.name.toLowerCase()).anyMatch(n -> n.equals("bar")));
     }
 
 
@@ -135,8 +135,8 @@ public void testBasicForeignKey() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(2, schema.tables.size());
 
-        TableDto bar = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Bar")).findAny().get();
-        TableDto foo = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto bar = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Bar")).findAny().get();
+        TableDto foo = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(0, bar.foreignKeys.size());
         assertEquals(1, foo.foreignKeys.size());
@@ -184,7 +184,7 @@ public void testColumnUpperBoundConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(2, fooTable.columns.size());
 
@@ -212,7 +212,7 @@ public void testTableConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(2, fooTable.columns.size());
 
@@ -236,7 +236,7 @@ public void testPrimaryKey() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -257,7 +257,7 @@ public void testEnumStringConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(2, fooTable.columns.size());
 
@@ -282,7 +282,7 @@ public void testEnumBooleanConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -306,7 +306,7 @@ public void testEnumIntegerConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -331,7 +331,7 @@ public void testEnumTinyIntConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -355,7 +355,7 @@ public void testEnumSmallIntConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -380,7 +380,7 @@ public void testEnumBigIntConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -404,7 +404,7 @@ public void testEnumDoubleConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -429,7 +429,7 @@ public void testEnumRealConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -453,7 +453,7 @@ public void testEnumDecimalConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -475,7 +475,7 @@ public void testEnumCharConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -498,7 +498,7 @@ public void testEnumLikeConstraint() throws Exception {
 
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -520,7 +520,7 @@ public void testCreateEnumIntColumn() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -546,7 +546,7 @@ public void testCreateEnumColumn() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -571,7 +571,7 @@ public void testEnumColumn() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        TableDto fooTable = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("Foo")).findAny().get();
+        TableDto fooTable = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("Foo")).findAny().get();
 
         assertEquals(1, fooTable.columns.size());
 
@@ -598,7 +598,7 @@ public void testArray() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 
@@ -621,7 +621,7 @@ public void testMultidimensionalArrayOfTwoDimensions() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 
@@ -644,7 +644,7 @@ public void testMultidimensionalArrayOfThreeDimensions() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 
@@ -667,7 +667,7 @@ public void testBooleanNonlArray() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 
@@ -690,7 +690,7 @@ public void testVarCharArray() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 
@@ -714,7 +714,7 @@ public void testIntegerArrayWithMaxLengthColumn() throws Exception {
         DbInfoDto schema = DbInfoExtractor.extract(getConnection());
         assertEquals(1, schema.tables.size());
 
-        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.name.equalsIgnoreCase("foo")).findAny();
+        Optional<TableDto> fooTableOptional = schema.tables.stream().filter(t -> t.id.name.equalsIgnoreCase("foo")).findAny();
         assertTrue(fooTableOptional.isPresent());
         TableDto fooTable = fooTableOptional.get();
 

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/h2/H2SqlHandlerTest.java

@@ -31,7 +31,7 @@ public void testHandleNoRows(boolean useCompleteSqlHeuristics) throws Exception
         DbInfoExtractor dbInfoExtractor = new DbInfoExtractor();
         DbInfoDto schema = dbInfoExtractor.extract(connection);
         assertEquals(1, schema.tables.size());
-        assertEquals("Person".toUpperCase(), schema.tables.get(0).name.toUpperCase());
+        assertEquals("Person".toUpperCase(), schema.tables.get(0).id.name.toUpperCase());
 
         SqlHandler sqlHandler = new SqlHandler(null);
         sqlHandler.setConnection(connection);
@@ -67,7 +67,7 @@ public void testHandleOneOrMoreRows(boolean useCompleteSqlHeuristics) throws Exc
         DbInfoExtractor dbInfoExtractor = new DbInfoExtractor();
         DbInfoDto schema = dbInfoExtractor.extract(connection);
         assertEquals(1, schema.tables.size());
-        assertEquals("Person".toUpperCase(), schema.tables.get(0).name.toUpperCase());
+        assertEquals("Person".toUpperCase(), schema.tables.get(0).id.name.toUpperCase());
 
         SqlScriptRunner.execCommand(connection, "INSERT INTO Person (person_id, first_name, last_name, age, email)\n" +
                 "VALUES (1, 'John', 'Doe', 30, '[email protected]');");

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/mysql/DatabaseFakeMySQLSutController.java

@@ -55,7 +55,7 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
     public String startSut() {
         running = true;
 
-        DbCleaner.clearDatabase(sqlConnection, DB_NAME,null, DatabaseType.MYSQL);
+        DbCleaner.clearDatabase_MySQL(sqlConnection, DB_NAME,null, null);
         return "foo";
     }
 

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/sql/mysql/MySQLSchemaExtractorTest.java

@@ -86,7 +86,7 @@ public void testCaseSensitivityOfExtractor() throws Exception {
 
         TableDto table = schema.tables.get(0);
         assertEquals("intColumn",table.columns.get(0).name);
-        assertEquals("TableNot", table.name);
+        assertEquals("TableNot", table.id.name);
 
     }
 
@@ -163,15 +163,15 @@ public void testTwoSchemas() throws Exception {
         DbInfoDto schemaTest0 = DbInfoExtractor.extract(testUser0Connection);
         assertEquals("test", schemaTest0.name);
         assertEquals(1, schemaTest0.tables.size());
-        assertEquals("my_table", schemaTest0.tables.get(0).name);
+        assertEquals("my_table", schemaTest0.tables.get(0).id.name);
 
         DbInfoDto newSchema = DbInfoExtractor.extract(testUser1Connection);
 //        assertEquals("new_schema", newSchema.name);
         assertEquals("test", newSchema.name); //the connection is still on same URL, with same catalog
         //assertEquals(1, newSchema.tables.size());
         //we are now fetching data for all schemas (/catalogs in MySQL)
         assertEquals(2, newSchema.tables.size());
-        assertEquals("my_table", newSchema.tables.get(0).name);
+        assertEquals("my_table", newSchema.tables.get(0).id.name);
 
         SqlScriptRunner.execCommand(testUser1Connection, "DROP SCHEMA IF EXISTS new_schema");
         deleteUserInDatabase(url, anotherTestUserName);