From fd71335c41d618498e4cfc52104ded2f42c85874 Mon Sep 17 00:00:00 2001 From: Juan Pablo Galeotti Date: Sun, 5 May 2019 17:45:09 -0300 Subject: [PATCH] module renamed to dbconstraint / package renamed to org.evomaster.dbconstraint --- .../controller/internal/db/SchemaExtractor.java | 4 ++-- .../controller/internal/db/SelectHeuristics.java | 4 ++-- .../db/constraint/H2ConstraintExtractor.java | 6 +++--- .../java/controller/db/DbCleanerTestBase.java | 5 +++-- .../java/controller/db/SqlScriptRunnerTest.java | 12 ++++++------ .../internal/db/SchemaExtractorTest.java | 4 ++-- core/pom.xml | 7 ++----- .../src/main/kotlin/org/evomaster/core/EMConfig.kt | 6 +++--- .../kotlin/org/evomaster/core/database/DbAction.kt | 2 +- .../org/evomaster/core/database/DbActionUtils.kt | 6 +++--- .../evomaster/core/database/SqlInsertBuilder.kt | 2 +- .../core/database/SqlInsertBuilderTest.kt | 2 +- .../database/extract/ProxyPrintSqlExtractTest.kt | 4 ++-- {db-constraints => dbconstraint}/pom.xml | 2 +- .../org/evomaster/dbconstraint}/AndConstraint.java | 2 +- .../evomaster/dbconstraint}/ConstraintBuilder.java | 14 +++++++------- .../evomaster/dbconstraint}/EnumConstraint.java | 2 +- .../evomaster/dbconstraint}/LikeConstraint.java | 2 +- .../dbconstraint}/LowerBoundConstraint.java | 2 +- .../org/evomaster/dbconstraint}/OrConstraint.java | 2 +- .../evomaster/dbconstraint}/RangeConstraint.java | 2 +- .../dbconstraint}/SimilarToConstraint.java | 2 +- .../evomaster/dbconstraint}/TableConstraint.java | 2 +- .../evomaster/dbconstraint}/UniqueConstraint.java | 2 +- .../dbconstraint}/UnsupportedTableConstraint.java | 2 +- .../dbconstraint}/UpperBoundConstraint.java | 2 +- .../dbconstraint}/ast/SqlAndCondition.java | 2 +- .../ast/SqlBigDecimalLiteralValue.java | 2 +- .../ast/SqlBigIntegerLiteralValue.java | 2 +- .../ast/SqlBinaryDataLiteralValue.java | 2 +- .../dbconstraint}/ast/SqlBooleanLiteralValue.java | 2 +- .../org/evomaster/dbconstraint}/ast/SqlColumn.java | 2 +- .../dbconstraint}/ast/SqlComparisonCondition.java | 2 +- .../dbconstraint}/ast/SqlComparisonOperator.java | 2 +- .../evomaster/dbconstraint}/ast/SqlCondition.java | 2 +- .../dbconstraint}/ast/SqlConditionList.java | 2 +- .../dbconstraint}/ast/SqlConditionVisitor.java | 2 +- .../dbconstraint}/ast/SqlInCondition.java | 2 +- .../dbconstraint}/ast/SqlIsNotNullCondition.java | 2 +- .../dbconstraint}/ast/SqlIsNullCondition.java | 2 +- .../dbconstraint}/ast/SqlLikeCondition.java | 2 +- .../dbconstraint}/ast/SqlLiteralValue.java | 2 +- .../dbconstraint}/ast/SqlNullLiteralValue.java | 2 +- .../dbconstraint}/ast/SqlOrCondition.java | 2 +- .../dbconstraint}/ast/SqlSimilarToCondition.java | 2 +- .../dbconstraint}/ast/SqlStringLiteralValue.java | 2 +- .../extract/SqlConditionTranslator.java | 6 +++--- .../dbconstraint}/extract/TranslationContext.java | 2 +- .../dbconstraint}/parser/SqlConditionParser.java | 4 ++-- .../parser/SqlConditionParserException.java | 2 +- .../parser/SqlConditionParserFactory.java | 4 ++-- .../parser/calcite/CalciteConditionParser.java | 8 ++++---- .../parser/calcite/CalciteSqlNodeVisitor.java | 2 +- .../parser/jsql/JSqlConditionParser.java | 8 ++++---- .../dbconstraint}/parser/jsql/JSqlVisitor.java | 4 ++-- .../dbconstraint}/ConstraintBuilderTest.java | 2 +- .../dbconstraint}/SqlConditionParserTest.java | 8 ++++---- pom.xml | 4 ++-- 58 files changed, 97 insertions(+), 99 deletions(-) rename {db-constraints => dbconstraint}/pom.xml (94%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/AndConstraint.java (92%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ConstraintBuilder.java (63%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/EnumConstraint.java (94%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/LikeConstraint.java (92%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/LowerBoundConstraint.java (93%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/OrConstraint.java (90%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/RangeConstraint.java (94%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/SimilarToConstraint.java (92%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/TableConstraint.java (89%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/UniqueConstraint.java (92%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/UnsupportedTableConstraint.java (90%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/UpperBoundConstraint.java (93%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlAndCondition.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlBigDecimalLiteralValue.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlBigIntegerLiteralValue.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlBinaryDataLiteralValue.java (91%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlBooleanLiteralValue.java (95%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlColumn.java (97%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlComparisonCondition.java (97%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlComparisonOperator.java (89%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlCondition.java (93%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlConditionList.java (97%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlConditionVisitor.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlInCondition.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlIsNotNullCondition.java (95%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlIsNullCondition.java (95%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlLikeCondition.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlLiteralValue.java (62%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlNullLiteralValue.java (94%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlOrCondition.java (97%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlSimilarToCondition.java (96%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/ast/SqlStringLiteralValue.java (95%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/extract/SqlConditionTranslator.java (98%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/extract/TranslationContext.java (86%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/SqlConditionParser.java (60%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/SqlConditionParserException.java (77%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/SqlConditionParserFactory.java (57%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/calcite/CalciteConditionParser.java (76%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/calcite/CalciteSqlNodeVisitor.java (99%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/jsql/JSqlConditionParser.java (75%) rename {db-constraints/src/main/java/org/evomaster/constraint => dbconstraint/src/main/java/org/evomaster/dbconstraint}/parser/jsql/JSqlVisitor.java (99%) rename {db-constraints/src/test/java/org/evomaster/constraint => dbconstraint/src/test/java/org/evomaster/dbconstraint}/ConstraintBuilderTest.java (98%) rename {db-constraints/src/test/java/org/evomaster/constraint => dbconstraint/src/test/java/org/evomaster/dbconstraint}/SqlConditionParserTest.java (97%) diff --git a/client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/SchemaExtractor.java b/client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/SchemaExtractor.java index e8e497f633..f370d9bd75 100644 --- a/client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/SchemaExtractor.java +++ b/client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/SchemaExtractor.java @@ -92,7 +92,7 @@ is empty or not, and only way is to call next() /** - * Adds a unique constraint to the correspondinding ColumnDTO for the selected table.column pair. + * Adds a unique dbconstraint to the correspondinding ColumnDTO for the selected table.column pair. * Requires the ColumnDTO to be contained in the TableDTO. * If the column DTO is not contained, a IllegalArgumentException is thrown. **/ @@ -161,7 +161,7 @@ private static void addConstraints(DbSchemaDto schemaDto, List extractTableConstraints(Connection connectionToH } else if (constraintType.equals("REFERENTIAL")) { /** - * This type of constraint is already handled by + * This type of dbconstraint is already handled by * JDBC Metadata **/ continue; } else if (constraintType.equals("PRIMARY KEY") || constraintType.equals("PRIMARY_KEY")) { /** - * This type of constraint is already handled by + * This type of dbconstraint is already handled by * JDBC Metadata **/ continue; @@ -87,7 +87,7 @@ private List extractTableConstraints(Connection connectionToH tableCheckExpressions.add(constraint); } else { - throw new RuntimeException("Unknown constraint type : " + constraintType); + throw new RuntimeException("Unknown dbconstraint type : " + constraintType); } } diff --git a/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/DbCleanerTestBase.java b/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/DbCleanerTestBase.java index 280cbae501..12c6ebfdbb 100644 --- a/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/DbCleanerTestBase.java +++ b/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/DbCleanerTestBase.java @@ -6,7 +6,8 @@ import java.util.Arrays; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Created by arcuri82 on 25-Mar-19. @@ -55,7 +56,7 @@ public void testFKs() throws Exception{ SqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Foo(x int, primary key (x));"); SqlScriptRunner.execCommand(getConnection(), "CREATE TABLE Bar(y int, primary key (y));"); - SqlScriptRunner.execCommand(getConnection(), "alter table Bar add constraint FK foreign key (y) references Foo;"); + SqlScriptRunner.execCommand(getConnection(), "alter table Bar add dbconstraint FK foreign key (y) references Foo;"); //can't insert before Foo assertThrows(Exception.class, () -> diff --git a/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/SqlScriptRunnerTest.java b/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/SqlScriptRunnerTest.java index 34576b4b11..134477296d 100644 --- a/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/SqlScriptRunnerTest.java +++ b/client-java/controller/src/test/java/org/evomaster/client/java/controller/db/SqlScriptRunnerTest.java @@ -10,9 +10,9 @@ import java.util.List; import static io.restassured.RestAssured.given; -import static org.evomaster.client.java.controller.db.dsl.SqlDsl.sql; import static org.evomaster.client.java.controller.api.ControllerConstants.BASE_PATH; import static org.evomaster.client.java.controller.api.ControllerConstants.DATABASE_COMMAND; +import static org.evomaster.client.java.controller.db.dsl.SqlDsl.sql; import static org.junit.jupiter.api.Assertions.*; public class SqlScriptRunnerTest extends DatabaseTestTemplate { @@ -90,7 +90,7 @@ public void testInsertWhenForeignKey() throws Exception { ", barId bigint not null " + ");" + " CREATE TABLE Bar(id bigint generated by default as identity);" + - " ALTER TABLE Foo add constraint barIdKey foreign key (barId) references Bar;\n" + " ALTER TABLE Foo add dbconstraint barIdKey foreign key (barId) references Bar;\n" ); QueryResult res = SqlScriptRunner.execCommand(getConnection(), "SELECT * FROM Bar;"); @@ -125,7 +125,7 @@ public void testIdentityExtractGeneratedKey() throws Exception { " id bigint generated by default as identity " + ", x integer " + ", primary key (id));" + - " ALTER TABLE Foo add constraint barIdKey foreign key (barId) references Bar;\n" + " ALTER TABLE Foo add dbconstraint barIdKey foreign key (barId) references Bar;\n" ); QueryResult res = SqlScriptRunner.execCommand(getConnection(), "SELECT * FROM Bar;"); @@ -161,7 +161,7 @@ public void testInsertionListWithGeneratedKeys() throws Exception { " id bigint generated by default as identity " + ", x integer " + ", primary key (id));" + - " ALTER TABLE Foo add constraint barIdKey foreign key (barId) references Bar;\n" + " ALTER TABLE Foo add dbconstraint barIdKey foreign key (barId) references Bar;\n" ); QueryResult res = SqlScriptRunner.execCommand(getConnection(), "SELECT * FROM Bar;"); @@ -281,10 +281,10 @@ public void testDoubleIndirectForeignKey() throws Exception { ");" + "alter table Table2 " + - " add constraint FKTable2 foreign key (id) references Table1;" + " add dbconstraint FKTable2 foreign key (id) references Table1;" + "alter table Table3 " + - " add constraint FKTable3 foreign key (id) references Table2;" + " add dbconstraint FKTable3 foreign key (id) references Table2;" ); List insertions = sql() diff --git a/client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/SchemaExtractorTest.java b/client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/SchemaExtractorTest.java index 00d3c20ce0..56c55416ab 100644 --- a/client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/SchemaExtractorTest.java +++ b/client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/SchemaExtractorTest.java @@ -117,7 +117,7 @@ public void testBasicForeignKey() throws Exception { ", barId bigint not null " + ");" + " CREATE TABLE Bar(id bigint generated by default as identity);" + - " ALTER TABLE Foo add constraint barIdKey foreign key (barId) references Bar;\n" + " ALTER TABLE Foo add dbconstraint barIdKey foreign key (barId) references Bar;\n" ); DbSchemaDto schema = SchemaExtractor.extract(getConnection()); @@ -179,7 +179,7 @@ public void testColumnUpperBoundConstraint() throws Exception { assertTrue(fooTable.columns.stream().anyMatch(c -> c.name.equalsIgnoreCase("fooId"))); assertTrue(fooTable.columns.stream().anyMatch(c -> c.name.equalsIgnoreCase("age_max"))); - // TODO check that the column constraint is actually extracted + // TODO check that the column dbconstraint is actually extracted ColumnDto columnDto = fooTable.columns.stream().filter(c -> c.name.equalsIgnoreCase("age_max")).findFirst().orElse(null); assertEquals("INTEGER", columnDto.type); diff --git a/core/pom.xml b/core/pom.xml index 89a8a6b8af..db46797eae 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -126,13 +126,10 @@ org.evomaster - evomaster-db-constraints - - - org.evomaster - evomaster-db-constraints + evomaster-dbconstraint + diff --git a/core/src/main/kotlin/org/evomaster/core/EMConfig.kt b/core/src/main/kotlin/org/evomaster/core/EMConfig.kt index d739f31675..042978086a 100644 --- a/core/src/main/kotlin/org/evomaster/core/EMConfig.kt +++ b/core/src/main/kotlin/org/evomaster/core/EMConfig.kt @@ -162,7 +162,7 @@ class EMConfig { * chosen on the command line * * - * @throws IllegalArgumentException if there are constraint violations + * @throws IllegalArgumentException if there are dbconstraint violations */ fun updateProperties(options: OptionSet) { @@ -213,7 +213,7 @@ class EMConfig { m.annotations.find { it is Min }?.also { it as Min if(parameterValue.toDouble() < it.min){ - throw IllegalArgumentException("Failed to handle Min ${it.min} constraint for" + + throw IllegalArgumentException("Failed to handle Min ${it.min} dbconstraint for" + " parameter '${m.name}' with value $parameterValue") } } @@ -221,7 +221,7 @@ class EMConfig { m.annotations.find { it is Max }?.also { it as Max if(parameterValue.toDouble() > it.max){ - throw IllegalArgumentException("Failed to handle Max ${it.max} constraint for" + + throw IllegalArgumentException("Failed to handle Max ${it.max} dbconstraint for" + " parameter '${m.name}' with value $parameterValue") } } diff --git a/core/src/main/kotlin/org/evomaster/core/database/DbAction.kt b/core/src/main/kotlin/org/evomaster/core/database/DbAction.kt index e3b447b964..6e0059df74 100644 --- a/core/src/main/kotlin/org/evomaster/core/database/DbAction.kt +++ b/core/src/main/kotlin/org/evomaster/core/database/DbAction.kt @@ -235,7 +235,7 @@ class DbAction( */ /* This is a nasty case, as it is a blob of binary data. - Could be any format, and likely no constraint in the DB schema, + Could be any format, and likely no dbconstraint in the DB schema, where the actual constraints are in the SUT code. This is also what for example can be used by Hibernate to represent a ZoneDataTime before Java 8 support. diff --git a/core/src/main/kotlin/org/evomaster/core/database/DbActionUtils.kt b/core/src/main/kotlin/org/evomaster/core/database/DbActionUtils.kt index e9b2b2a5b7..4f34a4f9a9 100644 --- a/core/src/main/kotlin/org/evomaster/core/database/DbActionUtils.kt +++ b/core/src/main/kotlin/org/evomaster/core/database/DbActionUtils.kt @@ -1,11 +1,11 @@ package org.evomaster.core.database +import org.evomaster.core.Lazy import org.evomaster.core.search.Action import org.evomaster.core.search.gene.Gene import org.evomaster.core.search.gene.SqlForeignKeyGene import org.evomaster.core.search.gene.SqlPrimaryKeyGene import org.evomaster.core.search.service.Randomness -import org.evomaster.core.Lazy object DbActionUtils { @@ -189,13 +189,13 @@ object DbActionUtils { val tableName = action.table.name - //handle unique constraint + //handle unique dbconstraint action.seeGenes().forEach { g -> val columnName = g.name /* Is the current gene representing a column in database for which we need - to enforce a unique constraint? + to enforce a unique dbconstraint? */ val isUnique = action.table.columns.any { it.name == columnName && !it.autoIncrement && it.unique diff --git a/core/src/main/kotlin/org/evomaster/core/database/SqlInsertBuilder.kt b/core/src/main/kotlin/org/evomaster/core/database/SqlInsertBuilder.kt index 3e3ea7c5dc..df04b52dcf 100644 --- a/core/src/main/kotlin/org/evomaster/core/database/SqlInsertBuilder.kt +++ b/core/src/main/kotlin/org/evomaster/core/database/SqlInsertBuilder.kt @@ -5,7 +5,6 @@ import org.evomaster.client.java.controller.api.dto.database.operations.QueryRes import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType import org.evomaster.client.java.controller.api.dto.database.schema.DbSchemaDto import org.evomaster.client.java.controller.api.dto.database.schema.TableDto -import org.evomaster.constraint.* import org.evomaster.core.database.schema.Column import org.evomaster.core.database.schema.ColumnDataType import org.evomaster.core.database.schema.ForeignKey @@ -13,6 +12,7 @@ import org.evomaster.core.database.schema.Table import org.evomaster.core.search.gene.Gene import org.evomaster.core.search.gene.ImmutableDataHolderGene import org.evomaster.core.search.gene.SqlPrimaryKeyGene +import org.evomaster.dbconstraint.* class SqlInsertBuilder( diff --git a/core/src/test/kotlin/org/evomaster/core/database/SqlInsertBuilderTest.kt b/core/src/test/kotlin/org/evomaster/core/database/SqlInsertBuilderTest.kt index 0e6ffa44c6..1e50eceec1 100644 --- a/core/src/test/kotlin/org/evomaster/core/database/SqlInsertBuilderTest.kt +++ b/core/src/test/kotlin/org/evomaster/core/database/SqlInsertBuilderTest.kt @@ -147,7 +147,7 @@ class SqlInsertBuilderTest { id bigint generated by default as identity, primary key (id) ); - ALTER TABLE Foo add constraint barIdKey foreign key (barId) references Bar; + ALTER TABLE Foo add dbconstraint barIdKey foreign key (barId) references Bar; """) val dto = SchemaExtractor.extract(connection) diff --git a/core/src/test/kotlin/org/evomaster/core/database/extract/ProxyPrintSqlExtractTest.kt b/core/src/test/kotlin/org/evomaster/core/database/extract/ProxyPrintSqlExtractTest.kt index 4ebf1cc3ab..936b682020 100644 --- a/core/src/test/kotlin/org/evomaster/core/database/extract/ProxyPrintSqlExtractTest.kt +++ b/core/src/test/kotlin/org/evomaster/core/database/extract/ProxyPrintSqlExtractTest.kt @@ -1,7 +1,7 @@ package org.evomaster.core.database.extract -import org.evomaster.client.java.controller.internal.db.SchemaExtractor import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType +import org.evomaster.client.java.controller.internal.db.SchemaExtractor import org.evomaster.core.database.DbActionTransformer import org.evomaster.core.database.DbActionUtils import org.evomaster.core.database.SqlInsertBuilder @@ -46,7 +46,7 @@ class ProxyPrintSqlExtractTest : ExtractTestBaseH2() { /** * The schema includes an alter table command that specifies that * table USERS has a unique column USERNAME: - * alter table users add constraint UK_r43af9ap4edm43mmtq01oddj6 unique (username); + * alter table users add dbconstraint UK_r43af9ap4edm43mmtq01oddj6 unique (username); */ assertEquals(true, schema.tables.find { it.name == "USERS" }!!.columns.find { it.name == "USERNAME" }!!.unique) diff --git a/db-constraints/pom.xml b/dbconstraint/pom.xml similarity index 94% rename from db-constraints/pom.xml rename to dbconstraint/pom.xml index f45b6a8fa7..cca0473800 100644 --- a/db-constraints/pom.xml +++ b/dbconstraint/pom.xml @@ -21,7 +21,7 @@ org.evomaster - evomaster-db-constraints + evomaster-dbconstraint jar diff --git a/db-constraints/src/main/java/org/evomaster/constraint/AndConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/AndConstraint.java similarity index 92% rename from db-constraints/src/main/java/org/evomaster/constraint/AndConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/AndConstraint.java index 295a2f4726..2b9d1b85ef 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/AndConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/AndConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ConstraintBuilder.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ConstraintBuilder.java similarity index 63% rename from db-constraints/src/main/java/org/evomaster/constraint/ConstraintBuilder.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ConstraintBuilder.java index 80ac1b9c89..2fec530296 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ConstraintBuilder.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ConstraintBuilder.java @@ -1,11 +1,11 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; -import org.evomaster.constraint.ast.SqlCondition; -import org.evomaster.constraint.extract.SqlConditionTranslator; -import org.evomaster.constraint.extract.TranslationContext; -import org.evomaster.constraint.parser.SqlConditionParser; -import org.evomaster.constraint.parser.SqlConditionParserException; -import org.evomaster.constraint.parser.SqlConditionParserFactory; +import org.evomaster.dbconstraint.ast.SqlCondition; +import org.evomaster.dbconstraint.extract.SqlConditionTranslator; +import org.evomaster.dbconstraint.extract.TranslationContext; +import org.evomaster.dbconstraint.parser.SqlConditionParser; +import org.evomaster.dbconstraint.parser.SqlConditionParserException; +import org.evomaster.dbconstraint.parser.SqlConditionParserFactory; public class ConstraintBuilder { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/EnumConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/EnumConstraint.java similarity index 94% rename from db-constraints/src/main/java/org/evomaster/constraint/EnumConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/EnumConstraint.java index 442ad084fa..44b34bb710 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/EnumConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/EnumConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.List; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/LikeConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/LikeConstraint.java similarity index 92% rename from db-constraints/src/main/java/org/evomaster/constraint/LikeConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/LikeConstraint.java index 3d90df870c..3f95de9ddf 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/LikeConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/LikeConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/LowerBoundConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/LowerBoundConstraint.java similarity index 93% rename from db-constraints/src/main/java/org/evomaster/constraint/LowerBoundConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/LowerBoundConstraint.java index a4cb9e3f17..f800c2b2d3 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/LowerBoundConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/LowerBoundConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/OrConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/OrConstraint.java similarity index 90% rename from db-constraints/src/main/java/org/evomaster/constraint/OrConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/OrConstraint.java index c4ed1c8d22..d09af11eb4 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/OrConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/OrConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Arrays; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/RangeConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/RangeConstraint.java similarity index 94% rename from db-constraints/src/main/java/org/evomaster/constraint/RangeConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/RangeConstraint.java index 1e105c25ea..bb9aed8527 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/RangeConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/RangeConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/SimilarToConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/SimilarToConstraint.java similarity index 92% rename from db-constraints/src/main/java/org/evomaster/constraint/SimilarToConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/SimilarToConstraint.java index 72a8c01850..2848af40c3 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/SimilarToConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/SimilarToConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/TableConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/TableConstraint.java similarity index 89% rename from db-constraints/src/main/java/org/evomaster/constraint/TableConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/TableConstraint.java index 05452567d3..cd447e9a91 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/TableConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/TableConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/UniqueConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UniqueConstraint.java similarity index 92% rename from db-constraints/src/main/java/org/evomaster/constraint/UniqueConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/UniqueConstraint.java index 8be9dd78bb..7844007d5d 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/UniqueConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UniqueConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.List; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/UnsupportedTableConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UnsupportedTableConstraint.java similarity index 90% rename from db-constraints/src/main/java/org/evomaster/constraint/UnsupportedTableConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/UnsupportedTableConstraint.java index fa6b3ef165..a497d82c47 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/UnsupportedTableConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UnsupportedTableConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/UpperBoundConstraint.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UpperBoundConstraint.java similarity index 93% rename from db-constraints/src/main/java/org/evomaster/constraint/UpperBoundConstraint.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/UpperBoundConstraint.java index da42c50f50..18b71c0f58 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/UpperBoundConstraint.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/UpperBoundConstraint.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlAndCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlAndCondition.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlAndCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlAndCondition.java index 212c3e53b2..7b14368304 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlAndCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlAndCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigDecimalLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigDecimalLiteralValue.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigDecimalLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigDecimalLiteralValue.java index 8870d8a2e0..e3c4eb3887 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigDecimalLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigDecimalLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.math.BigDecimal; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigIntegerLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigIntegerLiteralValue.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigIntegerLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigIntegerLiteralValue.java index 2298fa1b59..7391fd20f3 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBigIntegerLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBigIntegerLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.math.BigInteger; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBinaryDataLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBinaryDataLiteralValue.java similarity index 91% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBinaryDataLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBinaryDataLiteralValue.java index 781fcb0f9a..f8125b612a 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBinaryDataLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBinaryDataLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; public class SqlBinaryDataLiteralValue extends SqlLiteralValue { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBooleanLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBooleanLiteralValue.java similarity index 95% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBooleanLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBooleanLiteralValue.java index 9ae3a27af1..37fe656771 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlBooleanLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlBooleanLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlColumn.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlColumn.java similarity index 97% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlColumn.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlColumn.java index 3cff729cca..57c676d064 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlColumn.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlColumn.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonCondition.java similarity index 97% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonCondition.java index f238bf9f12..7403cb0d74 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonOperator.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonOperator.java similarity index 89% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonOperator.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonOperator.java index fc828e7225..0e48722fb8 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlComparisonOperator.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlComparisonOperator.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; public enum SqlComparisonOperator { EQUALS_TO("="), diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlCondition.java similarity index 93% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlCondition.java index 13f2aaa4ab..ef9f7d50f7 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.List; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionList.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionList.java similarity index 97% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionList.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionList.java index 946f20cbb7..290e61177c 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionList.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionList.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.List; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionVisitor.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionVisitor.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionVisitor.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionVisitor.java index 7b1fbfb2d3..67e253c85f 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlConditionVisitor.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlConditionVisitor.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; public abstract class SqlConditionVisitor { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlInCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlInCondition.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlInCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlInCondition.java index f4909af77b..f533f44c4d 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlInCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlInCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNotNullCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNotNullCondition.java similarity index 95% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNotNullCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNotNullCondition.java index 98bb75cdb8..0ef1aeb313 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNotNullCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNotNullCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNullCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNullCondition.java similarity index 95% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNullCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNullCondition.java index 41cc16ea97..c80c28ebc8 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlIsNullCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlIsNullCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLikeCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLikeCondition.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLikeCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLikeCondition.java index 5055b9fb0d..b23071e6f1 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLikeCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLikeCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLiteralValue.java similarity index 62% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLiteralValue.java index 4d3010d683..262aff8544 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; public abstract class SqlLiteralValue extends SqlCondition { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlNullLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlNullLiteralValue.java similarity index 94% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlNullLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlNullLiteralValue.java index d7e66a81b7..acfc550524 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlNullLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlNullLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; public class SqlNullLiteralValue extends SqlLiteralValue { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlOrCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlOrCondition.java similarity index 97% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlOrCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlOrCondition.java index aac9820153..8b4e21fd75 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlOrCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlOrCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Arrays; import java.util.List; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlSimilarToCondition.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlSimilarToCondition.java similarity index 96% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlSimilarToCondition.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlSimilarToCondition.java index 7b77e7ddfa..d4cb7a3cff 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlSimilarToCondition.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlSimilarToCondition.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlStringLiteralValue.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlStringLiteralValue.java similarity index 95% rename from db-constraints/src/main/java/org/evomaster/constraint/ast/SqlStringLiteralValue.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlStringLiteralValue.java index 09cf756cca..129346be36 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/ast/SqlStringLiteralValue.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/ast/SqlStringLiteralValue.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.ast; +package org.evomaster.dbconstraint.ast; import java.util.Objects; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/extract/SqlConditionTranslator.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/SqlConditionTranslator.java similarity index 98% rename from db-constraints/src/main/java/org/evomaster/constraint/extract/SqlConditionTranslator.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/SqlConditionTranslator.java index 848730e4d9..859de83619 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/extract/SqlConditionTranslator.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/SqlConditionTranslator.java @@ -1,9 +1,9 @@ -package org.evomaster.constraint.extract; +package org.evomaster.dbconstraint.extract; import net.sf.jsqlparser.expression.StringValue; -import org.evomaster.constraint.*; -import org.evomaster.constraint.ast.*; +import org.evomaster.dbconstraint.*; +import org.evomaster.dbconstraint.ast.*; import java.util.ArrayList; import java.util.List; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/extract/TranslationContext.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/TranslationContext.java similarity index 86% rename from db-constraints/src/main/java/org/evomaster/constraint/extract/TranslationContext.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/TranslationContext.java index a527a8ffd2..bed547c7b4 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/extract/TranslationContext.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/extract/TranslationContext.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.extract; +package org.evomaster.dbconstraint.extract; public class TranslationContext { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParser.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParser.java similarity index 60% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParser.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParser.java index a7661f3cab..c920e8753e 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParser.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParser.java @@ -1,6 +1,6 @@ -package org.evomaster.constraint.parser; +package org.evomaster.dbconstraint.parser; -import org.evomaster.constraint.ast.SqlCondition; +import org.evomaster.dbconstraint.ast.SqlCondition; public abstract class SqlConditionParser { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserException.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserException.java similarity index 77% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserException.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserException.java index be4cb4335c..7019b07f87 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserException.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserException.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.parser; +package org.evomaster.dbconstraint.parser; public class SqlConditionParserException extends Exception { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserFactory.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserFactory.java similarity index 57% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserFactory.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserFactory.java index 4c0bb9bcbe..3551a69930 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/SqlConditionParserFactory.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/SqlConditionParserFactory.java @@ -1,6 +1,6 @@ -package org.evomaster.constraint.parser; +package org.evomaster.dbconstraint.parser; -import org.evomaster.constraint.parser.jsql.JSqlConditionParser; +import org.evomaster.dbconstraint.parser.jsql.JSqlConditionParser; public class SqlConditionParserFactory { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteConditionParser.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteConditionParser.java similarity index 76% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteConditionParser.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteConditionParser.java index 0326f1f224..2f2da2a23e 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteConditionParser.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteConditionParser.java @@ -1,12 +1,12 @@ -package org.evomaster.constraint.parser.calcite; +package org.evomaster.dbconstraint.parser.calcite; //import org.apache.calcite.sql.SqlNode; //import org.apache.calcite.sql.parser.SqlParseException; //import org.apache.calcite.sql.parser.SqlParser; -import org.evomaster.constraint.ast.SqlCondition; -import org.evomaster.constraint.parser.SqlConditionParser; -import org.evomaster.constraint.parser.SqlConditionParserException; +import org.evomaster.dbconstraint.ast.SqlCondition; +import org.evomaster.dbconstraint.parser.SqlConditionParser; +import org.evomaster.dbconstraint.parser.SqlConditionParserException; public class CalciteConditionParser extends SqlConditionParser { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteSqlNodeVisitor.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteSqlNodeVisitor.java similarity index 99% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteSqlNodeVisitor.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteSqlNodeVisitor.java index 08a069c363..1f112aeb96 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/calcite/CalciteSqlNodeVisitor.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/calcite/CalciteSqlNodeVisitor.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.parser.calcite; +package org.evomaster.dbconstraint.parser.calcite; //import org.apache.calcite.sql.*; //import org.apache.calcite.sql.util.SqlVisitor; diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlConditionParser.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlConditionParser.java similarity index 75% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlConditionParser.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlConditionParser.java index 82750a8331..7f2d85307f 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlConditionParser.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlConditionParser.java @@ -1,11 +1,11 @@ -package org.evomaster.constraint.parser.jsql; +package org.evomaster.dbconstraint.parser.jsql; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.parser.CCJSqlParserUtil; -import org.evomaster.constraint.ast.SqlCondition; -import org.evomaster.constraint.parser.SqlConditionParser; -import org.evomaster.constraint.parser.SqlConditionParserException; +import org.evomaster.dbconstraint.ast.SqlCondition; +import org.evomaster.dbconstraint.parser.SqlConditionParser; +import org.evomaster.dbconstraint.parser.SqlConditionParserException; public class JSqlConditionParser extends SqlConditionParser { diff --git a/db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlVisitor.java b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlVisitor.java similarity index 99% rename from db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlVisitor.java rename to dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlVisitor.java index b5e87ab1c7..f1622fbd1a 100644 --- a/db-constraints/src/main/java/org/evomaster/constraint/parser/jsql/JSqlVisitor.java +++ b/dbconstraint/src/main/java/org/evomaster/dbconstraint/parser/jsql/JSqlVisitor.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint.parser.jsql; +package org.evomaster.dbconstraint.parser.jsql; import net.sf.jsqlparser.expression.*; import net.sf.jsqlparser.expression.operators.arithmetic.*; @@ -7,7 +7,7 @@ import net.sf.jsqlparser.expression.operators.relational.*; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.statement.select.SubSelect; -import org.evomaster.constraint.ast.*; +import org.evomaster.dbconstraint.ast.*; import java.util.ArrayList; import java.util.List; diff --git a/db-constraints/src/test/java/org/evomaster/constraint/ConstraintBuilderTest.java b/dbconstraint/src/test/java/org/evomaster/dbconstraint/ConstraintBuilderTest.java similarity index 98% rename from db-constraints/src/test/java/org/evomaster/constraint/ConstraintBuilderTest.java rename to dbconstraint/src/test/java/org/evomaster/dbconstraint/ConstraintBuilderTest.java index 8356a60038..67eb0a9a0e 100644 --- a/db-constraints/src/test/java/org/evomaster/constraint/ConstraintBuilderTest.java +++ b/dbconstraint/src/test/java/org/evomaster/dbconstraint/ConstraintBuilderTest.java @@ -1,4 +1,4 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; import org.junit.jupiter.api.Test; diff --git a/db-constraints/src/test/java/org/evomaster/constraint/SqlConditionParserTest.java b/dbconstraint/src/test/java/org/evomaster/dbconstraint/SqlConditionParserTest.java similarity index 97% rename from db-constraints/src/test/java/org/evomaster/constraint/SqlConditionParserTest.java rename to dbconstraint/src/test/java/org/evomaster/dbconstraint/SqlConditionParserTest.java index 780c4bda58..5e8ab33816 100644 --- a/db-constraints/src/test/java/org/evomaster/constraint/SqlConditionParserTest.java +++ b/dbconstraint/src/test/java/org/evomaster/dbconstraint/SqlConditionParserTest.java @@ -1,8 +1,8 @@ -package org.evomaster.constraint; +package org.evomaster.dbconstraint; -import org.evomaster.constraint.ast.*; -import org.evomaster.constraint.parser.SqlConditionParserException; -import org.evomaster.constraint.parser.jsql.JSqlConditionParser; +import org.evomaster.dbconstraint.ast.*; +import org.evomaster.dbconstraint.parser.SqlConditionParserException; +import org.evomaster.dbconstraint.parser.jsql.JSqlConditionParser; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/pom.xml b/pom.xml index 88a69813c8..b48261fdf1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ pom - db-constraints + dbconstraint core client-java e2e-tests @@ -134,7 +134,7 @@ org.evomaster - evomaster-db-constraints + evomaster-dbconstraint ${project.version}