This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit dcf025c865aea01687b68eddb3bbfc6cd16b13a1 Author: Andrus Adamchik <[email protected]> AuthorDate: Wed May 13 12:19:19 2026 -0400 Unit tests cleanup --- .../org/apache/cayenne/test/jdbc/TableHelper.java | 16 ++-- .../cayenne/CDOCollectionRelationshipIT.java | 6 +- .../java/org/apache/cayenne/CDOMany2OneIT.java | 6 +- .../org/apache/cayenne/CDOMapRelationshipIT.java | 12 +-- .../java/org/apache/cayenne/CDOOne2ManyIT.java | 6 +- .../org/apache/cayenne/CDOSetRelationshipIT.java | 6 +- .../test/java/org/apache/cayenne/Cay2412IT.java | 9 +- .../java/org/apache/cayenne/CayenneCompoundIT.java | 9 +- .../test/java/org/apache/cayenne/CayenneIT.java | 6 +- .../CayennePersistentObjectFlattenedRelIT.java | 9 +- .../CayennePersistentObjectInContextIT.java | 3 +- .../CayennePersistentObjectRelationshipsIT.java | 10 +-- ...yennePersistentObjectSetToManyCollectionIT.java | 6 +- .../CayennePersistentObjectSetToManyListIT.java | 3 +- .../CayennePersistentObjectSetToManyMapIT.java | 12 +-- .../CayennePersistentObjectSetToManySetIT.java | 6 +- .../cayenne/DataContextMaxIdQualifierIT.java | 3 +- .../apache/cayenne/FlattenedRelationshipsIT.java | 18 ++-- .../org/apache/cayenne/OneWayRelationshipsIT.java | 9 +- .../java/org/apache/cayenne/access/Cay2032IT.java | 9 +- .../java/org/apache/cayenne/access/Cay2666IT.java | 3 +- .../access/DataContextDisjointByIdPrefetchIT.java | 6 +- .../DataContextDisjointByIdPrefetch_ExtrasIT.java | 18 ++-- .../access/DataContextEJBQLArrayResultIT.java | 3 +- .../access/DataContextEJBQLConditionsIT.java | 3 +- .../cayenne/access/DataContextEJBQLDeletePKIT.java | 3 +- .../access/DataContextEJBQLFetchJoinIT.java | 12 +-- .../DataContextEJBQLFlattenedRelationshipsIT.java | 9 +- .../access/DataContextEJBQLGroupByHavingIT.java | 6 +- .../cayenne/access/DataContextEJBQLIsNullIT.java | 3 +- .../cayenne/access/DataContextEJBQLJoinsIT.java | 6 +- .../DataContextEJBQLNumericalFunctionalIT.java | 3 +- .../cayenne/access/DataContextEJBQLOrderByIT.java | 3 +- .../access/DataContextEJBQLQueryCompoundIT.java | 6 +- .../cayenne/access/DataContextEJBQLQueryIT.java | 3 +- .../cayenne/access/DataContextEJBQLSubqueryIT.java | 3 +- .../access/DataContextEJBQLUpdateCompoundIT.java | 6 +- .../cayenne/access/DataContextEJBQLUpdateIT.java | 3 +- .../apache/cayenne/access/DataContextExtrasIT.java | 3 +- .../access/DataContextFlattenedAttributesIT.java | 9 +- .../org/apache/cayenne/access/DataContextIT.java | 12 +-- .../cayenne/access/DataContextIteratedQueryIT.java | 12 +-- .../cayenne/access/DataContextJoinAliasesIT.java | 12 +-- .../cayenne/access/DataContextLocalObjectIT.java | 3 +- .../access/DataContextObjectTrackingIT.java | 3 +- .../access/DataContextPaginatedQueryIT.java | 3 +- .../access/DataContextPerformQueryAPIIT.java | 3 +- .../access/DataContextPrefetchExtras1IT.java | 6 +- .../access/DataContextPrefetchExtrasIT.java | 12 +-- .../cayenne/access/DataContextPrefetchIT.java | 21 ++--- .../access/DataContextPrefetchMultistepIT.java | 12 +-- .../DataContextPrefetchQualifierOverlapIT.java | 6 +- .../cayenne/access/DataContextQueryCachingIT.java | 7 +- .../cayenne/access/DataContextRefreshQueryIT.java | 7 +- .../cayenne/access/DataContextRefreshingIT.java | 3 +- .../access/DataContextRelationshipQueryIT.java | 6 +- .../access/DataContextSQLTemplateCompoundIT.java | 6 +- .../cayenne/access/DataContextSQLTemplateIT.java | 3 +- .../cayenne/access/DataContextSerializationIT.java | 3 +- .../access/DataContextSharedCacheEmpiricIT.java | 3 +- .../apache/cayenne/access/DataNodeQueriesIT.java | 3 +- .../org/apache/cayenne/access/DataRowUtilsIT.java | 7 +- .../org/apache/cayenne/access/DeleteObjectIT.java | 6 +- .../org/apache/cayenne/access/EmbeddingIT.java | 12 +-- .../cayenne/access/EmbeddingSerializeIT.java | 3 +- .../java/org/apache/cayenne/access/EnumIT.java | 3 +- .../apache/cayenne/access/FlattenedPrefetchIT.java | 13 +-- .../access/FlattenedRelationshipInContextIT.java | 9 +- .../org/apache/cayenne/access/JointPrefetchIT.java | 10 +-- .../cayenne/access/NestedDataContextReadIT.java | 3 +- .../cayenne/access/NestedDataContextWriteIT.java | 22 ++--- .../access/NestedDataContext_DeadlockIT.java | 3 +- .../org/apache/cayenne/access/NumericTypesIT.java | 6 +- .../apache/cayenne/access/OptimisticLockingIT.java | 7 +- .../cayenne/access/PrimitiveAttributesIT.java | 3 +- .../SimpleIdIncrementalFaultListDataRowsIT.java | 3 +- .../access/SimpleIdIncrementalFaultListIT.java | 3 +- .../SimpleIdIncrementalFaultListPrefetchIT.java | 7 +- .../cayenne/access/SingleTableInheritanceIT.java | 9 +- .../cayenne/access/VerticalInheritanceIT.java | 96 ++++++++-------------- .../cayenne/access/jdbc/SQLTemplateActionIT.java | 3 +- ...SelectActionWithUnsupportedDistinctTypesIT.java | 12 +-- .../translator/select/QualifierTranslatorIT.java | 3 +- .../AshwoodEntitySorter_RelationshipsIT.java | 3 +- .../exp/AggregateExpInMemoryEvaluationIT.java | 9 +- .../cayenne/exp/ParsedExpQualifierCompatIT.java | 7 +- .../apache/cayenne/exp/TranslateExpressionIT.java | 9 +- .../org/apache/cayenne/exp/parser/ASTExistsIT.java | 9 +- .../apache/cayenne/exp/parser/ASTNotExistsIT.java | 9 +- .../parser/ExpressionCollectionEvaluationIT.java | 9 +- .../cayenne/exp/parser/ExpressionEvaluationIT.java | 9 +- .../apache/cayenne/exp/property/IdPropertyIT.java | 9 +- .../apache/cayenne/exp/property/PathAliasesIT.java | 12 +-- .../java/org/apache/cayenne/query/CAY2541IT.java | 9 +- .../org/apache/cayenne/query/ColumnSelectIT.java | 9 +- .../apache/cayenne/query/EJBQLQueryCountIT.java | 6 +- .../org/apache/cayenne/query/EJBQLQueryIT.java | 6 +- .../apache/cayenne/query/EJBQLQueryNumericIT.java | 3 +- .../org/apache/cayenne/query/MappedQueryIT.java | 3 +- .../cayenne/query/ObjectSelect_AggregateIT.java | 9 +- .../query/ObjectSelect_FetchLimitOrderingIT.java | 3 +- .../query/ObjectSelect_PrimitiveColumnsIT.java | 3 +- .../apache/cayenne/query/ObjectSelect_RunIT.java | 9 +- .../cayenne/query/ObjectSelect_SubqueryIT.java | 9 +- .../cayenne/query/QueryWithCompoundJoinIT.java | 6 +- .../query/QueryWithInheritancePrefetchIT.java | 6 +- .../org/apache/cayenne/query/SQLTemplateIT.java | 9 +- .../apache/cayenne/query/SelectQueryClobIT.java | 3 +- .../cayenne/query/SelectQueryReturnTypesIT.java | 3 +- .../reflect/MixedPersistenceStrategyIT.java | 6 +- .../cayenne/runtime/CayenneRuntimeBuilderIT.java | 3 +- .../org/apache/cayenne/unit/jira/CAY_115IT.java | 6 +- .../org/apache/cayenne/unit/jira/CAY_191IT.java | 6 +- .../org/apache/cayenne/unit/jira/CAY_194IT.java | 3 +- .../cayenne/util/ShallowMergeOperationIT.java | 3 +- 115 files changed, 290 insertions(+), 582 deletions(-) diff --git a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/TableHelper.java b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/TableHelper.java index 7178e897c..3cf889f78 100644 --- a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/TableHelper.java +++ b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/TableHelper.java @@ -29,19 +29,15 @@ import java.util.List; */ public class TableHelper { - protected String tableName; - protected DBHelper dbHelper; - protected String[] columns; - protected int[] columnTypes; + private final DBHelper dbHelper; + private final String tableName; + private String[] columns; + private int[] columnTypes; - public TableHelper(DBHelper dbHelper, String tableName) { + public TableHelper(DBHelper dbHelper, String tableName, String... columns) { this.dbHelper = dbHelper; this.tableName = tableName; - } - - public TableHelper(DBHelper dbHelper, String tableName, String... columns) { - this(dbHelper, tableName); - setColumns(columns); + this.columns = columns; } public UpdateBuilder update() throws SQLException { diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java index 1a5c25cfc..c9e1cc121 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CDOCollectionRelationshipIT.java @@ -49,11 +49,9 @@ public class CDOCollectionRelationshipIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - TableHelper tCollectionToMany = env.table("COLLECTION_TO_MANY"); - tCollectionToMany.setColumns("ID"); + TableHelper tCollectionToMany = env.table("COLLECTION_TO_MANY", "ID"); - TableHelper tCollectionToManyTarget = env.table("COLLECTION_TO_MANY_TARGET"); - tCollectionToManyTarget.setColumns("ID", "COLLECTION_TO_MANY_ID"); + TableHelper tCollectionToManyTarget = env.table("COLLECTION_TO_MANY_TARGET", "ID", "COLLECTION_TO_MANY_ID"); // single data set for all tests tCollectionToMany.insert(1).insert(2); diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java index d9655b013..2004fc3c2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CDOMany2OneIT.java @@ -59,16 +59,14 @@ public class CDOMany2OneIT { public void setUp() throws Exception { runtime = env.runtime(); context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting .setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.BIGINT, Types.INTEGER); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); } private void createArtistWithPaintingDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java index 2f7e1e252..a89677313 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CDOMapRelationshipIT.java @@ -54,17 +54,13 @@ public class CDOMapRelationshipIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tMapToMany = env.table("MAP_TO_MANY"); - tMapToMany.setColumns("ID"); + tMapToMany = env.table("MAP_TO_MANY", "ID"); - tMapToManyTarget = env.table("MAP_TO_MANY_TARGET"); - tMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID", "NAME"); + tMapToManyTarget = env.table("MAP_TO_MANY_TARGET", "ID", "MAP_TO_MANY_ID", "NAME"); - tIdMapToMany = env.table("ID_MAP_TO_MANY"); - tIdMapToMany.setColumns("ID"); + tIdMapToMany = env.table("ID_MAP_TO_MANY", "ID"); - tIdMapToManyTarget = env.table("ID_MAP_TO_MANY_TARGET"); - tIdMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID"); + tIdMapToManyTarget = env.table("ID_MAP_TO_MANY_TARGET", "ID", "MAP_TO_MANY_ID"); } protected void createTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java index 3356f5e49..4f3095f2a 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CDOOne2ManyIT.java @@ -58,11 +58,9 @@ public class CDOOne2ManyIT { public void setUp() throws Exception { runtime = env.runtime(); context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java b/cayenne/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java index ab02fe846..9bba4e670 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CDOSetRelationshipIT.java @@ -51,11 +51,9 @@ public class CDOSetRelationshipIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tSetToMany = env.table("SET_TO_MANY"); - tSetToMany.setColumns("ID"); + tSetToMany = env.table("SET_TO_MANY", "ID"); - tSetToManyTarget = env.table("SET_TO_MANY_TARGET"); - tSetToManyTarget.setColumns("ID", "SET_TO_MANY_ID"); + tSetToManyTarget = env.table("SET_TO_MANY_TARGET", "ID", "SET_TO_MANY_ID"); } protected void createTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java b/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java index 35a92390f..d41907347 100644 --- a/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/Cay2412IT.java @@ -48,17 +48,14 @@ public class Cay2412IT { public void prepareData() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tArtist.setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.DATE); tArtist.insert(1, "artist1", new java.sql.Date(System.currentTimeMillis())); - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 3; i++) { tPaintings.insert(i, "painting" + i, 1, 1, 22 - i); } diff --git a/cayenne/src/test/java/org/apache/cayenne/CayenneCompoundIT.java b/cayenne/src/test/java/org/apache/cayenne/CayenneCompoundIT.java index 2dc331bc4..8754c3d66 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayenneCompoundIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayenneCompoundIT.java @@ -54,14 +54,11 @@ public class CayenneCompoundIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tCompoundPKTest = env.table("COMPOUND_PK_TEST"); - tCompoundPKTest.setColumns("KEY1", "KEY2", "NAME"); + tCompoundPKTest = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2", "NAME"); - tCharPKTest = env.table("CHAR_PK_TEST"); - tCharPKTest.setColumns("PK_COL", "OTHER_COL"); + tCharPKTest = env.table("CHAR_PK_TEST", "PK_COL", "OTHER_COL"); - tCompoundIntPKTest = env.table("COMPOUND_INT_PK"); - tCompoundIntPKTest.setColumns("id1", "id2", "name"); + tCompoundIntPKTest = env.table("COMPOUND_INT_PK", "id1", "id2", "name"); } private void createOneCompoundPK() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java b/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java index 3279bcacc..6a7a524cf 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java @@ -61,11 +61,9 @@ public class CayenneIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); } diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java index c3b265443..b5ae0e522 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java @@ -66,14 +66,11 @@ public class CayennePersistentObjectFlattenedRelIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); dbHelper.update("ARTGROUP").set("PARENT_GROUP_ID", null, Types.INTEGER).execute(); env.getInstance(DBCleaner.class).clean(); - tArtist = new TableHelper(dbHelper, "ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = new TableHelper(dbHelper, "ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tArtGroup = new TableHelper(dbHelper, "ARTGROUP"); - tArtGroup.setColumns("GROUP_ID", "NAME"); + tArtGroup = new TableHelper(dbHelper, "ARTGROUP", "GROUP_ID", "NAME"); - tArtistGroup = new TableHelper(dbHelper, "ARTIST_GROUP"); - tArtistGroup.setColumns("ARTIST_ID", "GROUP_ID"); + tArtistGroup = new TableHelper(dbHelper, "ARTIST_GROUP", "ARTIST_ID", "GROUP_ID"); } private void create1Artist1ArtGroupDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java index 7c22e9533..96d9e901b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java @@ -48,8 +48,7 @@ public class CayennePersistentObjectInContextIT { public void setUp() throws Exception { runtime = env.runtime(); context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java index 784007b1e..41e91ea7d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java @@ -60,17 +60,13 @@ public class CayennePersistentObjectRelationshipsIT { public void setUp() throws Exception { context = env.context(); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); - tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW"); + tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); } private void createArtistWithPaintingDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyCollectionIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyCollectionIT.java index bc0ccf421..ad0f71dd0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyCollectionIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyCollectionIT.java @@ -43,11 +43,9 @@ public class CayennePersistentObjectSetToManyCollectionIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - TableHelper tCollectionToMany = env.table("COLLECTION_TO_MANY"); - tCollectionToMany.setColumns("ID"); + TableHelper tCollectionToMany = env.table("COLLECTION_TO_MANY", "ID"); - TableHelper tCollectionToManyTarget = env.table("COLLECTION_TO_MANY_TARGET"); - tCollectionToManyTarget.setColumns("ID", "COLLECTION_TO_MANY_ID"); + TableHelper tCollectionToManyTarget = env.table("COLLECTION_TO_MANY_TARGET", "ID", "COLLECTION_TO_MANY_ID"); // single data set for all tests tCollectionToMany.insert(1).insert(2); diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java index 056202a4c..136e462e1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyListIT.java @@ -53,8 +53,7 @@ public class CayennePersistentObjectSetToManyListIT { public void setUp() throws Exception { runtime = env.runtime(); context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyMapIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyMapIT.java index 29f4df3b0..801e62d9f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyMapIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManyMapIT.java @@ -47,17 +47,13 @@ public class CayennePersistentObjectSetToManyMapIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tMapToMany = env.table("MAP_TO_MANY"); - tMapToMany.setColumns("ID"); + tMapToMany = env.table("MAP_TO_MANY", "ID"); - tMapToManyTarget = env.table("MAP_TO_MANY_TARGET"); - tMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID", "NAME"); + tMapToManyTarget = env.table("MAP_TO_MANY_TARGET", "ID", "MAP_TO_MANY_ID", "NAME"); - tIdMapToMany = env.table("ID_MAP_TO_MANY"); - tIdMapToMany.setColumns("ID"); + tIdMapToMany = env.table("ID_MAP_TO_MANY", "ID"); - tIdMapToManyTarget = env.table("ID_MAP_TO_MANY_TARGET"); - tIdMapToManyTarget.setColumns("ID", "MAP_TO_MANY_ID"); + tIdMapToManyTarget = env.table("ID_MAP_TO_MANY_TARGET", "ID", "MAP_TO_MANY_ID"); createTestDataSet(); } diff --git a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManySetIT.java b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManySetIT.java index 5da939baa..823de8065 100644 --- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManySetIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectSetToManySetIT.java @@ -46,11 +46,9 @@ public class CayennePersistentObjectSetToManySetIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tSetToMany = env.table("SET_TO_MANY"); - tSetToMany.setColumns("ID"); + tSetToMany = env.table("SET_TO_MANY", "ID"); - tSetToManyTarget = env.table("SET_TO_MANY_TARGET"); - tSetToManyTarget.setColumns("ID", "SET_TO_MANY_ID"); + tSetToManyTarget = env.table("SET_TO_MANY_TARGET", "ID", "SET_TO_MANY_ID"); createTestDataSet(); } diff --git a/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java b/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java index cfa4caafc..5a60018bf 100644 --- a/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/DataContextMaxIdQualifierIT.java @@ -55,8 +55,7 @@ public class DataContextMaxIdQualifierIT { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, diff --git a/cayenne/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java index 9d8ab5592..1e12e4fcc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/FlattenedRelationshipsIT.java @@ -65,23 +65,17 @@ public class FlattenedRelationshipsIT { context = env.dataContext(); context1 = (DataContext) env.runtime().newContext(); - tFlattenedTest1 = env.table("FLATTENED_TEST_1"); - tFlattenedTest1.setColumns("FT1_ID", "NAME"); + tFlattenedTest1 = env.table("FLATTENED_TEST_1", "FT1_ID", "NAME"); - tFlattenedTest2 = env.table("FLATTENED_TEST_2"); - tFlattenedTest2.setColumns("FT2_ID", "FT1_ID", "NAME"); + tFlattenedTest2 = env.table("FLATTENED_TEST_2", "FT2_ID", "FT1_ID", "NAME"); - tFlattenedTest3 = env.table("FLATTENED_TEST_3"); - tFlattenedTest3.setColumns("FT3_ID", "FT2_ID", "NAME"); + tFlattenedTest3 = env.table("FLATTENED_TEST_3", "FT3_ID", "FT2_ID", "NAME"); - tComplexJoin = env.table("COMPLEX_JOIN"); - tComplexJoin.setColumns("PK", "FT1_FK", "FT3_FK", "EXTRA_COLUMN"); + tComplexJoin = env.table("COMPLEX_JOIN", "PK", "FT1_FK", "FT3_FK", "EXTRA_COLUMN"); - tFlattenedCircular = env.table("FLATTENED_CIRCULAR"); - tFlattenedCircular.setColumns("ID"); + tFlattenedCircular = env.table("FLATTENED_CIRCULAR", "ID"); - tFlattenedCircularJoin = env.table("FLATTENED_CIRCULAR_JOIN"); - tFlattenedCircularJoin.setColumns("SIDE1_ID", "SIDE2_ID"); + tFlattenedCircularJoin = env.table("FLATTENED_CIRCULAR_JOIN", "SIDE1_ID", "SIDE2_ID"); } private void createFlattenedTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java index 9c6e0c5b1..927238849 100644 --- a/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/OneWayRelationshipsIT.java @@ -54,13 +54,10 @@ public class OneWayRelationshipsIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - t1Helper = env.table("oneway_table1"); - t1Helper.setColumns("ID"); - t2Helper = env.table("oneway_table2"); - t2Helper.setColumns("ID", "TABLE1_ID"); + t1Helper = env.table("oneway_table1", "ID"); + t2Helper = env.table("oneway_table2", "ID", "TABLE1_ID"); - t3Helper = env.table("oneway_table3"); - t3Helper.setColumns("ID"); + t3Helper = env.table("oneway_table3", "ID"); t4Helper = env.table("oneway_table4"); t4Helper.setColumns("ID", "TABLE3_ID").setColumnTypes(Types.INTEGER, Types.INTEGER); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java b/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java index 2f2576bb5..4f1cef19c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2032IT.java @@ -44,21 +44,18 @@ public class Cay2032IT { @BeforeEach public void createTestData() throws Exception { // USERS table has field `name` BLOB to trigger suppressDistinct in translator - TableHelper tUser = env.table("USERS"); - tUser.setColumns("user_id"); + TableHelper tUser = env.table("USERS", "user_id"); tUser.insert(1); tUser.insert(2); tUser.insert(3); - TableHelper tTeam = env.table("TEAM"); - tTeam.setColumns("team_id"); + TableHelper tTeam = env.table("TEAM", "team_id"); tTeam.insert(1); tTeam.insert(2); tTeam.insert(3); tTeam.insert(4); - TableHelper tTeamHasUser = env.table("USER_HAS_TEAM"); - tTeamHasUser.setColumns("team_id", "user_id"); + TableHelper tTeamHasUser = env.table("USER_HAS_TEAM", "team_id", "user_id"); tTeamHasUser.insert(1, 2); tTeamHasUser.insert(2, 1); tTeamHasUser.insert(2, 2); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java b/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java index 6091cee9f..8c4acf3f0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/Cay2666IT.java @@ -128,8 +128,7 @@ public class Cay2666IT { @Test public void expressionWithDollarSign() throws Exception { - TableHelper tTest = env.table("Cay2666"); - tTest.setColumns("ID", "NAME$"); + TableHelper tTest = env.table("Cay2666", "ID", "NAME$"); tTest.insert(1, "st.One"); Expression expression = ExpressionFactory.exp("name$ = 'st.One'"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java index 7c5c30451..dbe90ba0c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetchIT.java @@ -61,15 +61,13 @@ public class DataContextDisjointByIdPrefetchIT { public void setUp() throws Exception { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE").setColumnTypes(Types.INTEGER, Types.BIGINT, Types.VARCHAR); - tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW"); + tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); } private void createArtistWithTwoPaintingsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java index 468a91e04..8174d4c63 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextDisjointByIdPrefetch_ExtrasIT.java @@ -59,23 +59,17 @@ public class DataContextDisjointByIdPrefetch_ExtrasIT { public void setUp() throws Exception { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tBag = env.table("BAG"); - tBag.setColumns("ID", "NAME"); + tBag = env.table("BAG", "ID", "NAME"); - tBall = env.table("BALL"); - tBall.setColumns("ID", "BOX_ID", "THING_VOLUME", "THING_WEIGHT"); + tBall = env.table("BALL", "ID", "BOX_ID", "THING_VOLUME", "THING_WEIGHT"); - tBox = env.table("BOX"); - tBox.setColumns("ID", "BAG_ID", "NAME"); + tBox = env.table("BOX", "ID", "BAG_ID", "NAME"); - tBoxInfo = env.table("BOX_INFO"); - tBoxInfo.setColumns("ID" ,"BOX_ID", "COLOR"); + tBoxInfo = env.table("BOX_INFO", "ID" ,"BOX_ID", "COLOR"); - tBoxThing = env.table("BOX_THING"); - tBoxThing.setColumns("BOX_ID", "THING_VOLUME", "THING_WEIGHT"); + tBoxThing = env.table("BOX_THING", "BOX_ID", "THING_VOLUME", "THING_WEIGHT"); - tThing = env.table("THING"); - tThing.setColumns("ID", "VOLUME", "WEIGHT"); + tThing = env.table("THING", "ID", "VOLUME", "WEIGHT"); } private void createBagWithTwoBoxesAndPlentyOfBallsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java index bf15b6c03..b68360068 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLArrayResultIT.java @@ -46,8 +46,7 @@ public class DataContextEJBQLArrayResultIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tArtist.insert(33001, "AA1"); tArtist.insert(33002, "AA2"); tArtist.insert(33003, "BB1"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java index 348d951ea..21b0dc131 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsIT.java @@ -55,8 +55,7 @@ public class DataContextEJBQLConditionsIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java index 9271236d6..0f8434829 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLDeletePKIT.java @@ -47,8 +47,7 @@ public class DataContextEJBQLDeletePKIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tMeaningfulPKTest1Table = env.table("MEANINGFUL_PK_TEST1"); - tMeaningfulPKTest1Table.setColumns("PK_ATTRIBUTE", "DESCR", "INT_ATTRIBUTE"); + tMeaningfulPKTest1Table = env.table("MEANINGFUL_PK_TEST1", "PK_ATTRIBUTE", "DESCR", "INT_ATTRIBUTE"); } protected void createMeaningfulPKDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java index fff20a3a4..1d7ea580e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFetchJoinIT.java @@ -66,8 +66,7 @@ public class DataContextEJBQLFetchJoinIT { public void setUp() throws Exception { context = env.context(); queryBlocker = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( @@ -80,14 +79,11 @@ public class DataContextEJBQLFetchJoinIT { Types.VARCHAR, Types.DECIMAL); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "CLOSING_DATE", "OPENING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "CLOSING_DATE", "OPENING_DATE"); - tArtistExhibit = env.table("ARTIST_EXHIBIT"); - tArtistExhibit.setColumns("ARTIST_ID", "EXHIBIT_ID"); + tArtistExhibit = env.table("ARTIST_EXHIBIT", "ARTIST_ID", "EXHIBIT_ID"); } protected void createOneFetchJoinDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java index f315c6300..f2da9bd01 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLFlattenedRelationshipsIT.java @@ -58,14 +58,11 @@ public class DataContextEJBQLFlattenedRelationshipsIT { context = env.context(); ft1Helper = env.table("FLATTENED_TEST_1", "FT1_ID", "NAME"); - ft2Helper = env.table("FLATTENED_TEST_2"); - ft2Helper.setColumns("FT2_ID", "FT1_ID", "NAME"); + ft2Helper = env.table("FLATTENED_TEST_2", "FT2_ID", "FT1_ID", "NAME"); - ft3Helper = env.table("FLATTENED_TEST_3"); - ft3Helper.setColumns("FT3_ID", "FT2_ID", "NAME"); + ft3Helper = env.table("FLATTENED_TEST_3", "FT3_ID", "FT2_ID", "NAME"); - ft4Helper = env.table("FLATTENED_TEST_4"); - ft4Helper.setColumns("FT4_ID", "FT3_ID", "NAME"); + ft4Helper = env.table("FLATTENED_TEST_4", "FT4_ID", "FT3_ID", "NAME"); } private void createFt123() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java index 7d39756e4..ea8ed0d1b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLGroupByHavingIT.java @@ -57,8 +57,7 @@ public class DataContextEJBQLGroupByHavingIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( @@ -73,8 +72,7 @@ public class DataContextEJBQLGroupByHavingIT { Types.VARCHAR, Types.DECIMAL); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); } private void createFivePaintings() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java index 0246b0ac6..4844f1f15 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLIsNullIT.java @@ -53,8 +53,7 @@ public class DataContextEJBQLIsNullIT { public void setUp() throws Exception { context = env.context(); accessStackAdapter = env.getInstance(UnitDbAdapter.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java index a69f1d26c..c2cd1f406 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLJoinsIT.java @@ -54,15 +54,13 @@ public class DataContextEJBQLJoinsIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "GALLERY_ID", "PAINTING_TITLE", "ESTIMATED_PRICE") .setColumnTypes(Types.INTEGER, Types.BIGINT, Types.INTEGER, Types.VARCHAR, Types.DECIMAL); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); } private void createFourArtistsFourPaintings() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java index f36d29492..2f844c259 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLNumericalFunctionalIT.java @@ -55,8 +55,7 @@ public class DataContextEJBQLNumericalFunctionalIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tBigIntegerEntity = env.table("BIGINTEGER_ENTITY"); - tBigIntegerEntity.setColumns("ID", "BIG_INTEGER_FIELD"); + tBigIntegerEntity = env.table("BIGINTEGER_ENTITY", "ID", "BIG_INTEGER_FIELD"); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java index fb7b3eefd..74b7a44f0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLOrderByIT.java @@ -49,8 +49,7 @@ public class DataContextEJBQLOrderByIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java index 85e0af444..cc9773982 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryCompoundIT.java @@ -56,11 +56,9 @@ public class DataContextEJBQLQueryCompoundIT { public void setUp() throws Exception { context = env.context(); accessStackAdapter = env.getInstance(UnitDbAdapter.class); - tCompoundPk = env.table("COMPOUND_PK_TEST"); - tCompoundPk.setColumns("KEY1", "KEY2"); + tCompoundPk = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2"); - tCompoundFk = env.table("COMPOUND_FK_TEST"); - tCompoundFk.setColumns("PKEY", "F_KEY1", "F_KEY2"); + tCompoundFk = env.table("COMPOUND_FK_TEST", "PKEY", "F_KEY1", "F_KEY2"); } private void createTwoCompoundPKTwoFK() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java index 85a4d1ecc..39604e7bf 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLQueryIT.java @@ -63,8 +63,7 @@ public class DataContextEJBQLQueryIT { public void setUp() throws Exception { context = env.context(); accessStackAdapter = env.getInstance(UnitDbAdapter.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java index fd1454c2a..339425cc6 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLSubqueryIT.java @@ -57,8 +57,7 @@ public class DataContextEJBQLSubqueryIT { public void setUp() throws Exception { context = env.context(); accessStackAdapter = env.getInstance(UnitDbAdapter.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java index 4673e53fa..6c2b01693 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateCompoundIT.java @@ -53,11 +53,9 @@ public class DataContextEJBQLUpdateCompoundIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tCompoundPk = env.table("COMPOUND_PK_TEST"); - tCompoundPk.setColumns("KEY1", "KEY2"); + tCompoundPk = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2"); - tCompoundFk = env.table("COMPOUND_FK_TEST"); - tCompoundFk.setColumns("PKEY", "F_KEY1", "F_KEY2"); + tCompoundFk = env.table("COMPOUND_FK_TEST", "PKEY", "F_KEY1", "F_KEY2"); } private void createTwoCompoundPKTwoFK() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java index 8c99f356b..d778270c1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextEJBQLUpdateIT.java @@ -50,8 +50,7 @@ public class DataContextEJBQLUpdateIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java index 9c20b836b..b9d3aba1b 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextExtrasIT.java @@ -72,8 +72,7 @@ public class DataContextExtrasIT { context = env.dataContext(); logger = env.getInstance(JdbcEventLogger.class); objectFactory = env.getInstance(AdhocObjectFactory.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java index df0228f37..5a9f32be1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextFlattenedAttributesIT.java @@ -69,8 +69,7 @@ public class DataContextFlattenedAttributesIT { public void createTestDataSetStructure() { context = env.dataContext(); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tPainting = env.table("PAINTING"); tPainting.setColumns( @@ -85,11 +84,9 @@ public class DataContextFlattenedAttributesIT { Types.DECIMAL, Types.INTEGER); - tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW"); + tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); } private void createTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java index 3dddb1156..00acfed9c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIT.java @@ -82,17 +82,13 @@ public class DataContextIT { accessStackAdapter = env.getInstance(UnitDbAdapter.class); queryInterceptor = env.getInstance(DataChannelInterceptor.class); dataSourceFactory = env.getInstance(RuntimeCaseDataSourceFactory.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); } protected void createSingleArtistDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIteratedQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIteratedQueryIT.java index d9a239f66..c8a84b7fa 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextIteratedQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextIteratedQueryIT.java @@ -52,17 +52,13 @@ public class DataContextIteratedQueryIT { @BeforeEach public void before() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); } private void createArtistsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java index 70618bac4..e5b4331f3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextJoinAliasesIT.java @@ -51,17 +51,13 @@ public class DataContextJoinAliasesIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tArtistExhibit = env.table("ARTIST_EXHIBIT"); - tArtistExhibit.setColumns("EXHIBIT_ID", "ARTIST_ID"); + tArtistExhibit = env.table("ARTIST_EXHIBIT", "EXHIBIT_ID", "ARTIST_ID"); } protected void createMatchAllDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java index c315c3bc2..66c3d4c3d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextLocalObjectIT.java @@ -62,8 +62,7 @@ public class DataContextLocalObjectIT { context2 = (DataContext) env.runtime().newContext(); interceptor = env.getInstance(DataChannelInterceptor.class); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java index cf629a0cf..9a42d8ef9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextObjectTrackingIT.java @@ -67,8 +67,7 @@ public class DataContextObjectTrackingIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); context = env.dataContext(); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java index 0fbe074fb..c2038ef5d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPaginatedQueryIT.java @@ -47,8 +47,7 @@ public class DataContextPaginatedQueryIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } protected void createArtistsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java index 71ed454c4..4c3e85851 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPerformQueryAPIIT.java @@ -73,8 +73,7 @@ public class DataContextPerformQueryAPIIT { accessStackAdapter = env.getInstance(UnitDbAdapter.class); queryInterceptor = env.getInstance(DataChannelInterceptor.class); jdbcEventLogger = env.getInstance(JdbcEventLogger.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE").setColumnTypes( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java index f45470df8..fe8151bb8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtras1IT.java @@ -44,11 +44,9 @@ public class DataContextPrefetchExtras1IT { protected void createDataSet() throws Exception { - TableHelper tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE"); + TableHelper tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE"); - TableHelper tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW"); + TableHelper tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); for (int i = 1; i <= 10; i++) { tPainting.insert(i, "P" + i); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java index 8239bff33..a4a8d24e5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchExtrasIT.java @@ -61,17 +61,13 @@ public class DataContextPrefetchExtrasIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tCharPkTest = env.table("CHAR_PK_TEST"); - tCharPkTest.setColumns("PK_COL", "OTHER_COL"); + tCharPkTest = env.table("CHAR_PK_TEST", "PK_COL", "OTHER_COL"); - tCharFkTest = env.table("CHAR_FK_TEST"); - tCharFkTest.setColumns("PK", "FK_COL", "NAME"); + tCharFkTest = env.table("CHAR_FK_TEST", "PK", "FK_COL", "NAME"); - tCompoundPkTest = env.table("COMPOUND_PK_TEST"); - tCompoundPkTest.setColumns("KEY1", "KEY2", "NAME"); + tCompoundPkTest = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2", "NAME"); - tCompoundFkTest = env.table("COMPOUND_FK_TEST"); - tCompoundFkTest.setColumns("PKEY", "F_KEY1", "F_KEY2", "NAME"); + tCompoundFkTest = env.table("COMPOUND_FK_TEST", "PKEY", "F_KEY1", "F_KEY2", "NAME"); } protected void createPrefetchToManyOnCharKeyDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java index 7a2cab35b..b86f127a8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchIT.java @@ -79,30 +79,23 @@ public class DataContextPrefetchIT { public void setUp() throws Exception { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE", "GALLERY_ID").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.BIGINT, Types.DECIMAL, Types.INTEGER); - tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW"); + tPaintingInfo = env.table("PAINTING_INFO", "PAINTING_ID", "TEXT_REVIEW"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); - tArtistExhibit = env.table("ARTIST_EXHIBIT"); - tArtistExhibit.setColumns("ARTIST_ID", "EXHIBIT_ID"); + tArtistExhibit = env.table("ARTIST_EXHIBIT", "ARTIST_ID", "EXHIBIT_ID"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tArtistGroup = env.table("ARTIST_GROUP"); - tArtistGroup.setColumns("ARTIST_ID", "GROUP_ID"); + tArtistGroup = env.table("ARTIST_GROUP", "ARTIST_ID", "GROUP_ID"); - tArtGroup = env.table("ARTGROUP"); - tArtGroup.setColumns("GROUP_ID", "NAME"); + tArtGroup = env.table("ARTGROUP", "GROUP_ID", "NAME"); } protected void createTwoArtistsAndTwoPaintingsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java index a5c6819d6..099e7fd08 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java @@ -66,17 +66,13 @@ public class DataContextPrefetchMultistepIT { public void setUp() throws Exception { context = env.dataContext(); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tExhibit = env.table("EXHIBIT"); - tExhibit.setColumns("EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); + tExhibit = env.table("EXHIBIT", "EXHIBIT_ID", "GALLERY_ID", "OPENING_DATE", "CLOSING_DATE"); - tArtistExhibit = env.table("ARTIST_EXHIBIT"); - tArtistExhibit.setColumns("ARTIST_ID", "EXHIBIT_ID"); + tArtistExhibit = env.table("ARTIST_EXHIBIT", "ARTIST_ID", "EXHIBIT_ID"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); } protected void createTwoArtistsWithExhibitsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java index b6ec414b1..7b56584b4 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchQualifierOverlapIT.java @@ -38,11 +38,9 @@ public class DataContextPrefetchQualifierOverlapIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); private void createTwoArtistsThreePaintingsDataSet() throws Exception { - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - TableHelper tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); + TableHelper tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); tArtist.insert(1, "A1"); tArtist.insert(2, "A2"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java index c95666e97..eefdfb6d9 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextQueryCachingIT.java @@ -65,12 +65,9 @@ public class DataContextQueryCachingIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java index 5da550fd8..5d0afca59 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshQueryIT.java @@ -53,12 +53,9 @@ public class DataContextRefreshQueryIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java index fd7a1122e..b5bcb8a92 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRefreshingIT.java @@ -63,8 +63,7 @@ public class DataContextRefreshingIT { public void setUp() throws Exception { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java index 9330e1df2..6d8172f65 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextRelationshipQueryIT.java @@ -49,10 +49,8 @@ public class DataContextRelationshipQueryIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); } private void createOneArtistOnePaintingDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java index 122ac0d4c..91fdf6e64 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateCompoundIT.java @@ -52,11 +52,9 @@ public class DataContextSQLTemplateCompoundIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tCompoundPkTest = env.table("COMPOUND_PK_TEST"); - tCompoundPkTest.setColumns("KEY1", "KEY2"); + tCompoundPkTest = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2"); - tCompoundFkTest = env.table("COMPOUND_FK_TEST"); - tCompoundFkTest.setColumns("PKEY", "F_KEY1", "F_KEY2"); + tCompoundFkTest = env.table("COMPOUND_FK_TEST", "PKEY", "F_KEY1", "F_KEY2"); } protected void createTwoCompoundPKsAndCompoundFKsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java index f7a604c78..24aba3ddc 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateIT.java @@ -65,8 +65,7 @@ public class DataContextSQLTemplateIT { runtime = env.runtime(); context = env.dataContext(); sqlTemplateCustomizer = env.getInstance(SQLTemplateCustomizer.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE").setColumnTypes( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java index 6cbfe7568..00ad78c41 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSerializationIT.java @@ -66,8 +66,7 @@ public class DataContextSerializationIT { logger = env.getInstance(JdbcEventLogger.class); CayenneRuntime.bindThreadInjector(runtime.getInjector()); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } protected void createSingleArtistDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java index ab7d4835d..7bdd7f5ce 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataContextSharedCacheEmpiricIT.java @@ -77,8 +77,7 @@ public class DataContextSharedCacheEmpiricIT { new ObjectStore(cache, new HashMap<>())); // prepare a single artist record - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tArtist.insert(1, "version1"); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java index a41304dee..35292e292 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataNodeQueriesIT.java @@ -55,8 +55,7 @@ public class DataNodeQueriesIT { public void setUp() throws Exception { node = env.getInstance(DataNode.class); sqlTemplateCustomizer = env.getInstance(SQLTemplateCustomizer.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } protected void createFourArtists() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java index 73e93df8f..253e6d881 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DataRowUtilsIT.java @@ -54,12 +54,9 @@ public class DataRowUtilsIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java index a310ed3e3..5b7c97e31 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/DeleteObjectIT.java @@ -54,11 +54,9 @@ public class DeleteObjectIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID"); } protected void createHollowDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingIT.java index 74780ed83..4884cba10 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingIT.java @@ -57,17 +57,13 @@ public class EmbeddingIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tEmbedEntity1 = env.table("EMBED_ENTITY1"); - tEmbedEntity1.setColumns("ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40"); + tEmbedEntity1 = env.table("EMBED_ENTITY1", "ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40"); - tEmbedEntity2 = env.table("EMBED_ENTITY2"); - tEmbedEntity2.setColumns("ID", "NAME", "ENTITY1_ID", "EMBEDDED10", "EMBEDDED20"); + tEmbedEntity2 = env.table("EMBED_ENTITY2", "ID", "NAME", "ENTITY1_ID", "EMBEDDED10", "EMBEDDED20"); - tEmbedRoot = env.table("EMBED_ROOT"); - tEmbedRoot.setColumns("ID", "NAME", "EMBEDDED10", "EMBEDDED20", "TYPE"); + tEmbedRoot = env.table("EMBED_ROOT", "ID", "NAME", "EMBEDDED10", "EMBEDDED20", "TYPE"); - tEmbedChild = env.table("EMBED_CHILD"); - tEmbedChild.setColumns("ID", "CHILD_ATTR"); + tEmbedChild = env.table("EMBED_CHILD", "ID", "CHILD_ATTR"); } protected void createSelectDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java b/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java index 1cbd3817f..45c0177a0 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/EmbeddingSerializeIT.java @@ -51,8 +51,7 @@ public class EmbeddingSerializeIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tEmbedEntity1 = env.table("EMBED_ENTITY1"); - tEmbedEntity1.setColumns("ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40"); + tEmbedEntity1 = env.table("EMBED_ENTITY1", "ID", "NAME", "EMBEDDED10", "EMBEDDED20", "EMBEDDED30", "EMBEDDED40"); } protected void createSelectDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/EnumIT.java b/cayenne/src/test/java/org/apache/cayenne/access/EnumIT.java index 36c48ce6f..6da4fafbb 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/EnumIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/EnumIT.java @@ -44,8 +44,7 @@ public class EnumIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.ENUM_PROJECT); private void createDataSet() throws Exception { - TableHelper tEnumEntity = env.table("ENUM_ENTITY"); - tEnumEntity.setColumns("ID", "ENUM_ATTRIBUTE"); + TableHelper tEnumEntity = env.table("ENUM_ENTITY", "ID", "ENUM_ATTRIBUTE"); tEnumEntity.insert(1, "two"); tEnumEntity.insert(2, "one"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java index f0483645b..331fed905 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/FlattenedPrefetchIT.java @@ -62,21 +62,16 @@ public class FlattenedPrefetchIT { queryInterceptor = env.getInstance(DataChannelInterceptor.class); context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); - tArtgroup = env.table("ARTGROUP"); - tArtgroup.setColumns("GROUP_ID", "NAME"); + tArtgroup = env.table("ARTGROUP", "GROUP_ID", "NAME"); - tArtistGroup = env.table("ARTIST_GROUP"); - tArtistGroup.setColumns("ARTIST_ID", "GROUP_ID"); + tArtistGroup = env.table("ARTIST_GROUP", "ARTIST_ID", "GROUP_ID"); } protected void createPrefetchDataSet1() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java b/cayenne/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java index b99a3f065..07cf98b0e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/FlattenedRelationshipInContextIT.java @@ -53,14 +53,11 @@ public class FlattenedRelationshipInContextIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tFlattenedTest1 = env.table("FLATTENED_TEST_1"); - tFlattenedTest1.setColumns("FT1_ID", "NAME"); + tFlattenedTest1 = env.table("FLATTENED_TEST_1", "FT1_ID", "NAME"); - tFlattenedTest2 = env.table("FLATTENED_TEST_2"); - tFlattenedTest2.setColumns("FT2_ID", "FT1_ID", "NAME"); + tFlattenedTest2 = env.table("FLATTENED_TEST_2", "FT2_ID", "FT1_ID", "NAME"); - tFlattenedTest3 = env.table("FLATTENED_TEST_3"); - tFlattenedTest3.setColumns("FT3_ID", "FT2_ID", "NAME"); + tFlattenedTest3 = env.table("FLATTENED_TEST_3", "FT3_ID", "FT2_ID", "NAME"); } protected void createFlattenedTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java index 23502a1e3..e353310e7 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/JointPrefetchIT.java @@ -73,15 +73,11 @@ public class JointPrefetchIT { context = env.dataContext(); runtime = env.runtime(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE", diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java index 5e9772217..1079fc5d8 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextReadIT.java @@ -60,8 +60,7 @@ public class NestedDataContextReadIT { runtime = env.runtime(); context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java index b787fdef6..50cf4a638 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContextWriteIT.java @@ -19,11 +19,6 @@ package org.apache.cayenne.access; -import java.sql.Types; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; - import org.apache.cayenne.Cayenne; import org.apache.cayenne.ObjectContext; import org.apache.cayenne.PersistenceState; @@ -39,10 +34,15 @@ import org.apache.cayenne.testdo.testmap.PaintingInfo; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.runtime.CayenneProjects; import org.apache.cayenne.unit.di.runtime.CayenneTestsEnv; -import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import java.sql.Types; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -63,8 +63,7 @@ public class NestedDataContextWriteIT { runtime = env.runtime(); context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tPainting = env.table("PAINTING"); tPainting.setColumns( @@ -76,9 +75,6 @@ public class NestedDataContextWriteIT { Types.VARCHAR, Types.BIGINT, Types.DECIMAL); - - TableHelper tPaintingInfo = env.table("PAINTING_INFO"); - tPaintingInfo.setColumns("PAINTING_ID", "TEXT_REVIEW", "IMAGE_BLOB"); } private void createArtistsDataSet() throws Exception { @@ -645,11 +641,11 @@ public class NestedDataContextWriteIT { assertEquals(0, artist.getPaintingArray().size()); assertEquals(1, localParentMt.getPaintingArray().size()); - assertEquals(localParentMt.getPaintingArray().get(0).getObjectContext(), child); + assertEquals(localParentMt.getPaintingArray().getFirst().getObjectContext(), child); child.commitChangesToParent(); assertEquals(1, artist.getPaintingArray().size()); - assertEquals(artist.getPaintingArray().get(0).getObjectContext(), context); + assertEquals(artist.getPaintingArray().getFirst().getObjectContext(), context); } diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java index faf147776..1ede88b51 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NestedDataContext_DeadlockIT.java @@ -49,8 +49,7 @@ public class NestedDataContext_DeadlockIT { public void setUp() throws Exception { parent = env.dataContext(); runtime = env.runtime(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } private void createArtists() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java index 513d155fb..797a657d4 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/NumericTypesIT.java @@ -73,11 +73,9 @@ public class NumericTypesIT { runtime = env.runtime(); commitStats.before(); - tSmallintTest = env.table("SMALLINT_TEST"); - tSmallintTest.setColumns("ID", "SMALLINT_COL"); + tSmallintTest = env.table("SMALLINT_TEST", "ID", "SMALLINT_COL"); - tTinyintTest = env.table("TINYINT_TEST"); - tTinyintTest.setColumns("ID", "TINYINT_COL"); + tTinyintTest = env.table("TINYINT_TEST", "ID", "TINYINT_COL"); } @AfterEach diff --git a/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java b/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java index b637b791a..aa7917bb2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/OptimisticLockingIT.java @@ -58,14 +58,11 @@ public class OptimisticLockingIT { tSimpleLockingTest.setColumns("LOCKING_TEST_ID", "NAME", "DESCRIPTION", "INT_COLUMN_NOTNULL") .setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.INTEGER); - tRelLockingTest = env.table("REL_LOCKING_TEST"); - tRelLockingTest.setColumns( - "REL_LOCKING_TEST_ID", + tRelLockingTest = env.table("REL_LOCKING_TEST", "REL_LOCKING_TEST_ID", "SIMPLE_LOCKING_TEST_ID", "NAME"); - tLockingHelper = env.table("LOCKING_HELPER"); - tLockingHelper.setColumns("LOCKING_HELPER_ID", "REL_LOCKING_TEST_ID", "NAME"); + tLockingHelper = env.table("LOCKING_HELPER", "LOCKING_HELPER_ID", "REL_LOCKING_TEST_ID", "NAME"); } protected void createSimpleLockingDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java index 2f8dbeddf..6c6551824 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/PrimitiveAttributesIT.java @@ -48,8 +48,7 @@ public class PrimitiveAttributesIT { @Test public void selectTest() throws Exception { - TableHelper tPrimitives = env.table("PRIMITIVES_TEST"); - tPrimitives.setColumns("ID", "BOOLEAN_COLUMN", "INT_COLUMN", "CHAR_COLUMN"); + TableHelper tPrimitives = env.table("PRIMITIVES_TEST", "ID", "BOOLEAN_COLUMN", "INT_COLUMN", "CHAR_COLUMN"); tPrimitives.insert(1, true, -100, String.valueOf('a')) .insert(2, false, 0, String.valueOf('~')) .insert(3, true, Integer.MAX_VALUE, String.valueOf('Z')); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java index e1cee7385..60f0a1275 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListDataRowsIT.java @@ -54,8 +54,7 @@ public class SimpleIdIncrementalFaultListDataRowsIT { public void setUp() throws Exception { context = env.dataContext(); context1 = (DataContext) env.runtime().newContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); createArtistsDataSet(); ObjectSelect<DataRow> q = ObjectSelect.dataRowQuery(Artist.class) diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java index 748443fdf..94d21db68 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListIT.java @@ -48,8 +48,7 @@ public class SimpleIdIncrementalFaultListIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } protected void createArtistsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java index 1c9ccb6cc..28c0c7cef 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SimpleIdIncrementalFaultListPrefetchIT.java @@ -57,12 +57,9 @@ public class SimpleIdIncrementalFaultListPrefetchIT { public void setUp() throws Exception { context = env.context(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPaining = env.table("PAINTING"); - tPaining.setColumns( - "PAINTING_ID", + tPaining = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java index 43f9497e8..950376c84 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -64,14 +64,11 @@ public class SingleTableInheritanceIT extends PeopleProjectCase { context = env.dataContext(); context2 = (DataContext) env.runtime().newContext(); queryBlocker = env.getInstance(DataChannelInterceptor.class); - tAddress = new TableHelper(dbHelper, "ADDRESS"); - tAddress.setColumns("ADDRESS_ID", "CITY", "PERSON_ID"); + tAddress = new TableHelper(dbHelper, "ADDRESS", "ADDRESS_ID", "CITY", "PERSON_ID"); - tClientCompany = new TableHelper(dbHelper, "CLIENT_COMPANY"); - tClientCompany.setColumns("CLIENT_COMPANY_ID", "NAME"); + tClientCompany = new TableHelper(dbHelper, "CLIENT_COMPANY", "CLIENT_COMPANY_ID", "NAME"); - tDepartment = new TableHelper(dbHelper, "DEPARTMENT"); - tDepartment.setColumns("DEPARTMENT_ID", "NAME"); + tDepartment = new TableHelper(dbHelper, "DEPARTMENT", "DEPARTMENT_ID", "NAME"); tPerson = new TableHelper(dbHelper, "PERSON").setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY", "CLIENT_COMPANY_ID", "DEPARTMENT_ID").setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.CHAR, diff --git a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java index ced016055..0ace51477 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java @@ -84,8 +84,7 @@ public class VerticalInheritanceIT { @Test public void insertRoot() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); assertEquals(0, ivRootTable.getRowCount()); @@ -106,11 +105,9 @@ public class VerticalInheritanceIT { @Test public void insertSub1() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); IvSub1 sub1 = context.newObject(IvSub1.class); sub1.setName("XyZX"); @@ -150,11 +147,9 @@ public class VerticalInheritanceIT { @Test public void insertSub2() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub2Table = env.table("IV_SUB2"); - ivSub2Table.setColumns("ID", "SUB2_NAME", "SUB2_ATTR"); + TableHelper ivSub2Table = env.table("IV_SUB2", "ID", "SUB2_NAME", "SUB2_ATTR"); IvSub2 sub2 = context.newObject(IvSub2.class); sub2.setName("XyZX"); @@ -224,11 +219,9 @@ public class VerticalInheritanceIT { @Test public void validationOnInsertSub3Ok() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub3Table = env.table("IV_SUB3"); - ivSub3Table.setColumns("ID", "IV_ROOT_ID"); + TableHelper ivSub3Table = env.table("IV_SUB3", "ID", "IV_ROOT_ID"); IvSub3 sub3 = context.newObject(IvSub3.class); sub3.setName("XyZX"); @@ -244,14 +237,12 @@ public class VerticalInheritanceIT { */ @Test public void updateRelationSub3() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); ivRootTable.insert(1, "root1", null); ivRootTable.insert(2, "root2", null); ivRootTable.insert(3, "name", "IvSub3"); - TableHelper ivSub3Table = env.table("IV_SUB3"); - ivSub3Table.setColumns("ID", "IV_ROOT_ID"); + TableHelper ivSub3Table = env.table("IV_SUB3", "ID", "IV_ROOT_ID"); ivSub3Table.insert(3, 1); IvRoot root = SelectById.query(IvRoot.class, 2).selectOne(context); @@ -278,14 +269,11 @@ public class VerticalInheritanceIT { @Test public void insertSub1Sub1() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME", "SUB1_PRICE"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME", "SUB1_PRICE"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); IvSub1Sub1 sub1Sub1 = context.newObject(IvSub1Sub1.class); sub1Sub1.setName("XyZN"); @@ -325,8 +313,7 @@ public class VerticalInheritanceIT { ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); // insert ivRootTable.insert(1, "xROOT", null); @@ -367,14 +354,11 @@ public class VerticalInheritanceIT { ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); - TableHelper ivSub2Table = env.table("IV_SUB2"); - ivSub2Table.setColumns("ID", "SUB2_NAME"); + TableHelper ivSub2Table = env.table("IV_SUB2", "ID", "SUB2_NAME"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME"); // insert ivRootTable.insert(1, "xROOT", null); @@ -437,14 +421,11 @@ public class VerticalInheritanceIT { ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); - TableHelper ivSub2Table = env.table("IV_SUB2"); - ivSub2Table.setColumns("ID", "SUB2_NAME"); + TableHelper ivSub2Table = env.table("IV_SUB2", "ID", "SUB2_NAME"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME"); // insert ivRootTable.insert(1, "xROOT", null); @@ -496,14 +477,11 @@ public class VerticalInheritanceIT { ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); - TableHelper ivSub2Table = env.table("IV_SUB2"); - ivSub2Table.setColumns("ID", "SUB2_NAME"); + TableHelper ivSub2Table = env.table("IV_SUB2", "ID", "SUB2_NAME"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME"); // insert ivRootTable.insert(1, "xROOT", null); @@ -555,8 +533,7 @@ public class VerticalInheritanceIT { iv1RootTable.setColumns("ID", "NAME", "DISCRIMINATOR").setColumnTypes( Types.INTEGER, Types.VARCHAR, Types.VARCHAR); - TableHelper iv1Sub1Table = env.table("IV1_SUB1"); - iv1Sub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper iv1Sub1Table = env.table("IV1_SUB1", "ID", "SUB1_NAME"); // insert iv1RootTable.insert(1, "xROOT", null); @@ -1088,14 +1065,11 @@ public class VerticalInheritanceIT { @Test public void countEjbqlQuery() throws Exception { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME"); - TableHelper ivSub2Table = env.table("IV_SUB2"); - ivSub2Table.setColumns("ID", "SUB2_ATTR", "SUB2_NAME"); + TableHelper ivSub2Table = env.table("IV_SUB2", "ID", "SUB2_ATTR", "SUB2_NAME"); // Root, IvSub1, IvSub2 @@ -1130,14 +1104,11 @@ public class VerticalInheritanceIT { @Test public void columnSelectVerticalInheritanceSub1() throws SQLException { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME", "SUB1_PRICE"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME", "SUB1_PRICE"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); IvSub1Sub1 sub1Sub1 = context.newObject(IvSub1Sub1.class); sub1Sub1.setName("XyZN"); @@ -1178,14 +1149,11 @@ public class VerticalInheritanceIT { @Test public void columnSelectVerticalInheritanceSub1Sub1() throws SQLException { - TableHelper ivRootTable = env.table("IV_ROOT"); - ivRootTable.setColumns("ID", "NAME", "DISCRIMINATOR"); + TableHelper ivRootTable = env.table("IV_ROOT", "ID", "NAME", "DISCRIMINATOR"); - TableHelper ivSub1Table = env.table("IV_SUB1"); - ivSub1Table.setColumns("ID", "SUB1_NAME", "SUB1_PRICE"); + TableHelper ivSub1Table = env.table("IV_SUB1", "ID", "SUB1_NAME", "SUB1_PRICE"); - TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1"); - ivSub1Sub1Table.setColumns("ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); + TableHelper ivSub1Sub1Table = env.table("IV_SUB1_SUB1", "ID", "SUB1_SUB1_NAME", "SUB1_SUB1_PRICE"); IvSub1Sub1 sub1Sub1 = context.newObject(IvSub1Sub1.class); sub1Sub1.setName("XyZN"); diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java index af41f8794..b1aa50962 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateActionIT.java @@ -75,8 +75,7 @@ public class SQLTemplateActionIT { unitDbAdapter = env.getInstance(UnitDbAdapter.class); objectContext = env.context(); sqlTemplateCustomizer = env.getInstance(SQLTemplateCustomizer.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); } protected void createFourArtists() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SelectActionWithUnsupportedDistinctTypesIT.java b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SelectActionWithUnsupportedDistinctTypesIT.java index d66cf89bf..a7aa6455f 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SelectActionWithUnsupportedDistinctTypesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/jdbc/SelectActionWithUnsupportedDistinctTypesIT.java @@ -54,17 +54,13 @@ public class SelectActionWithUnsupportedDistinctTypesIT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tProduct = env.table("PRODUCT"); - tProduct.setColumns("ID", "LONGVARCHAR_COL"); + tProduct = env.table("PRODUCT", "ID", "LONGVARCHAR_COL"); - tCustomer = env.table("CUSTOMER"); - tCustomer.setColumns("ID", "LONGVARCHAR_COL"); + tCustomer = env.table("CUSTOMER", "ID", "LONGVARCHAR_COL"); - tComposition = env.table("COMPOSITION"); - tComposition.setColumns("BASE_ID", "CONTAINED_ID"); + tComposition = env.table("COMPOSITION", "BASE_ID", "CONTAINED_ID"); - tOrders = env.table("ORDERS"); - tOrders.setColumns("CUSTOMER_ID", "PRODUCT_ID"); + tOrders = env.table("ORDERS", "CUSTOMER_ID", "PRODUCT_ID"); } private void createCompositionManyToManyDataSet() throws SQLException { diff --git a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java index 02b3ec8a2..30150668e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorIT.java @@ -52,8 +52,7 @@ public class QualifierTranslatorIT { public void setUp() throws Exception { runtime = env.runtime(); context = env.context(); - TableHelper tCompoundPKTest = env.table("COMPOUND_PK_TEST"); - tCompoundPKTest.setColumns("KEY1", "KEY2", "NAME"); + TableHelper tCompoundPKTest = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2", "NAME"); tCompoundPKTest.insert("PK1", "PK2", "BBB"); tCompoundPKTest.insert("PK3", "PK4", "CCC"); } diff --git a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java index 711028cd0..c2a12b15d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/ashwood/AshwoodEntitySorter_RelationshipsIT.java @@ -54,8 +54,7 @@ public class AshwoodEntitySorter_RelationshipsIT { this.sorter = new AshwoodEntitySorter(); sorter.setEntityResolver(context.getEntityResolver()); - tRelationshipHelper = env.table("RELATIONSHIP_HELPER"); - tRelationshipHelper.setColumns("RELATIONSHIP_HELPER_ID", "NAME"); + tRelationshipHelper = env.table("RELATIONSHIP_HELPER", "RELATIONSHIP_HELPER_ID", "NAME"); tReflexiveAndToOne = env.table("REFLEXIVE_AND_TO_ONE"); tReflexiveAndToOne.setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID", "RELATIONSHIP_HELPER_ID", "NAME") diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/AggregateExpInMemoryEvaluationIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/AggregateExpInMemoryEvaluationIT.java index 2e8d9f53d..3109e5373 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/AggregateExpInMemoryEvaluationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/AggregateExpInMemoryEvaluationIT.java @@ -55,8 +55,7 @@ public class AggregateExpInMemoryEvaluationIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tArtist.setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.DATE); java.sql.Date[] dates = new java.sql.Date[5]; @@ -67,12 +66,10 @@ public class AggregateExpInMemoryEvaluationIT { tArtist.insert(i, "artist" + i, dates[i % 5]); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1, i * 10); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java index 39ba8d13c..cc5b5bc9e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/ParsedExpQualifierCompatIT.java @@ -50,12 +50,9 @@ public class ParsedExpQualifierCompatIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns( - "PAINTING_ID", + tPainting = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "ESTIMATED_PRICE"); diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/TranslateExpressionIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/TranslateExpressionIT.java index fc281ef66..6a16e6015 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/TranslateExpressionIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/TranslateExpressionIT.java @@ -46,20 +46,17 @@ public class TranslateExpressionIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExistsIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExistsIT.java index 6248f8b20..a6518d3c2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExistsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTExistsIT.java @@ -51,20 +51,17 @@ public class ASTExistsIT { public void createArtistsDataSet() throws Exception { context = env.context(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTNotExistsIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTNotExistsIT.java index c029e160a..8026c8dcb 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTNotExistsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ASTNotExistsIT.java @@ -52,20 +52,17 @@ public class ASTNotExistsIT { public void createArtistsDataSet() throws Exception { context = env.context(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java index 3910de9c7..65ea76093 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionCollectionEvaluationIT.java @@ -51,16 +51,13 @@ public class ExpressionCollectionEvaluationIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tArtist.insert(1, "artist1", new java.sql.Date(System.currentTimeMillis())); - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 3; i++) { tPaintings.insert(i, i + "painting" + (Math.pow(10, i)), 1, 1, i * 100); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java index 235075ae2..eb82e04aa 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/parser/ExpressionEvaluationIT.java @@ -60,20 +60,17 @@ public class ExpressionEvaluationIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 6; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 10; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1, i * 100); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java index 0b7ae1e4c..b044ebbe5 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/IdPropertyIT.java @@ -52,8 +52,7 @@ public class IdPropertyIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); int artistCount = 4; @@ -61,12 +60,10 @@ public class IdPropertyIT { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 16; i++) { tPaintings.insert(i, "painting" + i, i % artistCount + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java b/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java index e579f0fb7..311a601a1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/exp/property/PathAliasesIT.java @@ -59,24 +59,20 @@ public class PathAliasesIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tGallery1 = env.table("GALLERY"); - tGallery1.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery1 = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery1.insert(2, "test gallery"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 2 == 0 ? 4 : i % 5 + 1, diff --git a/cayenne/src/test/java/org/apache/cayenne/query/CAY2541IT.java b/cayenne/src/test/java/org/apache/cayenne/query/CAY2541IT.java index 7a6217056..a25a28a91 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/CAY2541IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/CAY2541IT.java @@ -46,20 +46,17 @@ public class CAY2541IT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java index 48fa86d7d..912070852 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ColumnSelectIT.java @@ -78,8 +78,7 @@ public class ColumnSelectIT { context = env.dataContext(); runtime = env.runtime(); unitDbAdapter = env.getInstance(UnitDbAdapter.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tArtist.setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.DATE); java.sql.Date[] dates = new java.sql.Date[5]; @@ -90,12 +89,10 @@ public class ColumnSelectIT { tArtist.insert(i, "artist" + i, dates[i % 5]); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1, 22 - i); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryCountIT.java b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryCountIT.java index d61b8f4d5..24dd39342 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryCountIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryCountIT.java @@ -44,11 +44,9 @@ public class EJBQLQueryCountIT { @BeforeEach public void before() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); } @Test diff --git a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java index 2ddf74962..45ff6161d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryIT.java @@ -65,11 +65,9 @@ public class EJBQLQueryIT { context = env.dataContext(); runtime = env.runtime(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE"); } protected void createArtistsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java index d0124064c..7b4e7a8fe 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/EJBQLQueryNumericIT.java @@ -44,8 +44,7 @@ public class EJBQLQueryNumericIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tBigIntegerEntity = env.table("BIGINTEGER_ENTITY"); - tBigIntegerEntity.setColumns("ID", "BIG_INTEGER_FIELD"); + tBigIntegerEntity = env.table("BIGINTEGER_ENTITY", "ID", "BIG_INTEGER_FIELD"); } protected void createBigIntegerEntitiesDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java index cf09d340f..a47c41398 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/MappedQueryIT.java @@ -45,8 +45,7 @@ public class MappedQueryIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.TESTMAP_PROJECT); protected void createArtistsDataSet() throws Exception { - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java index 0ef79ff53..9abef6d2a 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java @@ -63,8 +63,7 @@ public class ObjectSelect_AggregateIT { public void createArtistsDataSet() throws Exception { context = env.dataContext(); dbAdapter = env.getInstance(UnitDbAdapter.class); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); tArtist.setColumnTypes(Types.INTEGER, Types.VARCHAR, Types.DATE); java.sql.Date[] dates = new java.sql.Date[5]; @@ -75,12 +74,10 @@ public class ObjectSelect_AggregateIT { tArtist.insert(i, "artist" + i, dates[i % 5]); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID", "ESTIMATED_PRICE"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1, i * 10); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_FetchLimitOrderingIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_FetchLimitOrderingIT.java index 92e6ee817..eb7805299 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_FetchLimitOrderingIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_FetchLimitOrderingIT.java @@ -44,8 +44,7 @@ public class ObjectSelect_FetchLimitOrderingIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); } protected void creatArtistsDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java index 5a342ee52..e8b827417 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_PrimitiveColumnsIT.java @@ -56,8 +56,7 @@ public class ObjectSelect_PrimitiveColumnsIT { public void createTestRecords() throws Exception { context = env.dataContext(); unitDbAdapter = env.getInstance(UnitDbAdapter.class); - tPrimitives = env.table("PRIMITIVES_TEST"); - tPrimitives.setColumns("ID", "BOOLEAN_COLUMN", "INT_COLUMN"); + tPrimitives = env.table("PRIMITIVES_TEST", "ID", "BOOLEAN_COLUMN", "INT_COLUMN"); for (int i = 1; i <= 20; i++) { tPrimitives.insert(i, (i % 2 == 0), i * 10); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java index 9324683a8..978ef0197 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java @@ -51,20 +51,17 @@ public class ObjectSelect_RunIT { public void createArtistsDataSet() throws Exception { unitDbAdapter = env.getInstance(UnitDbAdapter.class); context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis(); for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 10000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java index fb411ac4c..a3f2a88fd 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/ObjectSelect_SubqueryIT.java @@ -49,20 +49,17 @@ public class ObjectSelect_SubqueryIT { @BeforeEach public void createArtistsDataSet() throws Exception { context = env.dataContext(); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); long dateBase = System.currentTimeMillis() - 2 * 24 * 3600 * 1000; for (int i = 1; i <= 20; i++) { tArtist.insert(i, "artist" + i, new java.sql.Date(dateBase + 24 * 3600 * 1000 * i)); } - TableHelper tGallery = env.table("GALLERY"); - tGallery.setColumns("GALLERY_ID", "GALLERY_NAME"); + TableHelper tGallery = env.table("GALLERY", "GALLERY_ID", "GALLERY_NAME"); tGallery.insert(1, "tate modern"); - TableHelper tPaintings = env.table("PAINTING"); - tPaintings.setColumns("PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); + TableHelper tPaintings = env.table("PAINTING", "PAINTING_ID", "PAINTING_TITLE", "ARTIST_ID", "GALLERY_ID"); for (int i = 1; i <= 20; i++) { tPaintings.insert(i, "painting" + i, i % 5 + 1, 1); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java index faa66052b..840ed1c78 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithCompoundJoinIT.java @@ -55,11 +55,9 @@ public class QueryWithCompoundJoinIT { public void setUp() throws Exception { context = env.dataContext(); runtime = env.runtime(); - tCompoundPk = env.table("COMPOUND_PK_TEST"); - tCompoundPk.setColumns("KEY1", "KEY2", "NAME"); + tCompoundPk = env.table("COMPOUND_PK_TEST", "KEY1", "KEY2", "NAME"); - tCompoundFk = env.table("COMPOUND_FK_TEST"); - tCompoundFk.setColumns("F_KEY1", "F_KEY2", "NAME", "PKEY"); + tCompoundFk = env.table("COMPOUND_FK_TEST", "F_KEY1", "F_KEY2", "NAME", "PKEY"); createDataSet(); } diff --git a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java index e6aba79c4..85b48be7c 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java @@ -57,15 +57,13 @@ public class QueryWithInheritancePrefetchIT { public void createTestData() throws Exception { runtime = env.runtime(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - TableHelper tRoot = env.table("iwe_root"); - tRoot.setColumns("id", "type", "name", "enum"); + TableHelper tRoot = env.table("iwe_root", "id", "type", "name", "enum"); tRoot.insert(1, 0, "root1", null); tRoot.insert(2, 1, "enum1", Type.type1.ordinal()); tRoot.insert(3, 1, "enum2", Type.type2.ordinal()); - TableHelper tDependent = env.table("iwe_dependent"); - tDependent.setColumns("id", "root_id", "name"); + TableHelper tDependent = env.table("iwe_dependent", "id", "root_id", "name"); tDependent.insert(1, 1, "test1"); tDependent.insert(2, 2, "test2"); diff --git a/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java index fe6312c90..83aa3748d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java @@ -64,14 +64,11 @@ public class SQLTemplateIT { context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); unitDbAdapter = env.getInstance(UnitDbAdapter.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); - tPainting = env.table("PAINTING"); - tPainting.setColumns("PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE"); + tPainting = env.table("PAINTING", "PAINTING_ID", "ARTIST_ID", "PAINTING_TITLE", "ESTIMATED_PRICE"); - tArtistCt = env.table("ARTIST_CT"); - tArtistCt.setColumns("ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); + tArtistCt = env.table("ARTIST_CT", "ARTIST_ID", "ARTIST_NAME", "DATE_OF_BIRTH"); } private void createArtistDataSet() throws SQLException { diff --git a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryClobIT.java b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryClobIT.java index b63682e10..33f84cc0e 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryClobIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryClobIT.java @@ -39,8 +39,7 @@ public class SelectQueryClobIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.LOB_PROJECT); private void createClobDataSet() throws Exception { - TableHelper tClobTest = env.table("CLOB_TEST"); - tClobTest.setColumns("CLOB_TEST_ID", "CLOB_COL"); + TableHelper tClobTest = env.table("CLOB_TEST", "CLOB_TEST_ID", "CLOB_COL"); tClobTest.deleteAll(); diff --git a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryReturnTypesIT.java b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryReturnTypesIT.java index 6b1e67759..03e1f4dba 100644 --- a/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryReturnTypesIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/query/SelectQueryReturnTypesIT.java @@ -47,8 +47,7 @@ public class SelectQueryReturnTypesIT { static final CayenneTestsEnv env = CayenneTestsEnv.forProject(CayenneProjects.RETURN_TYPES_PROJECT); protected void createNumericsDataSet() throws Exception { - TableHelper tNumerics = env.table("TYPES_MAPPING_TEST1"); - tNumerics.setColumns("AAAID", "INTEGER_COLUMN"); + TableHelper tNumerics = env.table("TYPES_MAPPING_TEST1", "AAAID", "INTEGER_COLUMN"); tNumerics.insert(1, 0); tNumerics.insert(2, 1); diff --git a/cayenne/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java b/cayenne/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java index 8fce5d842..4623aca57 100644 --- a/cayenne/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/reflect/MixedPersistenceStrategyIT.java @@ -50,11 +50,9 @@ public class MixedPersistenceStrategyIT { @BeforeEach public void setUp() throws Exception { context = env.context(); - tMixedPersistenceStrategy = env.table("MIXED_PERSISTENCE_STRATEGY"); - tMixedPersistenceStrategy.setColumns("ID", "DESCRIPTION", "NAME"); + tMixedPersistenceStrategy = env.table("MIXED_PERSISTENCE_STRATEGY", "ID", "DESCRIPTION", "NAME"); - tMixedPersistenceStrategy2 = env.table("MIXED_PERSISTENCE_STRATEGY2"); - tMixedPersistenceStrategy2.setColumns("ID", "MASTER_ID", "NAME"); + tMixedPersistenceStrategy2 = env.table("MIXED_PERSISTENCE_STRATEGY2", "ID", "MASTER_ID", "NAME"); } protected void createConflictingFieldDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java index 8bd853613..9c98b842d 100644 --- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderIT.java @@ -67,8 +67,7 @@ public class CayenneRuntimeBuilderIT { public void setUp() throws Exception { runtime = env.runtime(); dsi = env.getInstance(DataSourceDescriptor.class); - TableHelper tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + TableHelper tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); tArtist.insert(33001, "AA1"); tArtist.insert(33002, "AA2"); diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java index 85bc7c056..13cf051a3 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_115IT.java @@ -53,11 +53,9 @@ public class CAY_115IT { public void setUp() throws Exception { context = env.dataContext(); accessStackAdapter = env.getInstance(UnitDbAdapter.class); - tClobMaster = env.table("CLOB_MASTER"); - tClobMaster.setColumns("CLOB_MASTER_ID", "CLOB_COLUMN", "NAME"); + tClobMaster = env.table("CLOB_MASTER", "CLOB_MASTER_ID", "CLOB_COLUMN", "NAME"); - tClobDetail = env.table("CLOB_DETAIL"); - tClobDetail.setColumns("CLOB_DETAIL_ID", "CLOB_MASTER_ID", "NAME"); + tClobDetail = env.table("CLOB_DETAIL", "CLOB_DETAIL_ID", "CLOB_MASTER_ID", "NAME"); } protected void createDistinctClobFetchDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java index 6a551173e..1f4cde2f2 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_191IT.java @@ -45,11 +45,9 @@ public class CAY_191IT { @BeforeEach public void setUp() throws Exception { context = env.dataContext(); - tRelationshipHelper = env.table("RELATIONSHIP_HELPER"); - tRelationshipHelper.setColumns("NAME", "RELATIONSHIP_HELPER_ID"); + tRelationshipHelper = env.table("RELATIONSHIP_HELPER", "NAME", "RELATIONSHIP_HELPER_ID"); - tFkOfDifferentType = env.table("FK_OF_DIFFERENT_TYPE"); - tFkOfDifferentType.setColumns("ID", "RELATIONSHIP_HELPER_FK"); + tFkOfDifferentType = env.table("FK_OF_DIFFERENT_TYPE", "ID", "RELATIONSHIP_HELPER_FK"); } protected void createTestDataSet() throws Exception { diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java index 062a6c47f..13d2b0e03 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_194IT.java @@ -53,8 +53,7 @@ public class CAY_194IT { public void setUp() throws Exception { context = env.dataContext(); dbHelper = env.dbHelper(); - TableHelper tReflexive = new TableHelper(dbHelper, "REFLEXIVE_AND_TO_ONE"); - tReflexive.setColumns("REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID"); + TableHelper tReflexive = new TableHelper(dbHelper, "REFLEXIVE_AND_TO_ONE", "REFLEXIVE_AND_TO_ONE_ID", "PARENT_ID"); tReflexive.update().set("PARENT_ID", null, Types.INTEGER).execute(); diff --git a/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java b/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java index dbb1668c5..02533bcdd 100644 --- a/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java +++ b/cayenne/src/test/java/org/apache/cayenne/util/ShallowMergeOperationIT.java @@ -57,8 +57,7 @@ public class ShallowMergeOperationIT { runtime = env.runtime(); context = env.dataContext(); queryInterceptor = env.getInstance(DataChannelInterceptor.class); - tArtist = env.table("ARTIST"); - tArtist.setColumns("ARTIST_ID", "ARTIST_NAME"); + tArtist = env.table("ARTIST", "ARTIST_ID", "ARTIST_NAME"); }
