You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/11/22 11:44:41 UTC
[1/4] cayenne git commit: fix DBCleaner for Derby
Repository: cayenne
Updated Branches:
refs/heads/master 583df135b -> 177a25bd8
fix DBCleaner for Derby
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/df3494b6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/df3494b6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/df3494b6
Branch: refs/heads/master
Commit: df3494b6b57adf5c92dd4c061e8c243f0d7c588d
Parents: 583df13
Author: Savva Kolbechev <s....@gmail.com>
Authored: Wed Nov 19 15:44:11 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Wed Nov 19 15:44:11 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/dba/JdbcPkGenerator.java | 30 ++---
.../DataContextEJBQLConditionsPeopleIT.java | 9 ++
.../access/DataContextEJBQLInheritanceIT.java | 10 ++
.../access/SingleTableInheritanceIT.java | 9 ++
.../cayenne/unit/di/server/DBCleaner.java | 115 ++++++++++---------
.../util/DeepMergeOperationInheritanceIT.java | 4 +
6 files changed, 106 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
index 968b8a1..1866944 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
@@ -19,19 +19,6 @@
package org.apache.cayenne.dba;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectId;
@@ -45,6 +32,19 @@ import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.util.IDUtil;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
/**
* Default primary key generator implementation. Uses a lookup table named
* "AUTO_PK_SUPPORT" to search and increment primary keys for tables.
@@ -76,7 +76,9 @@ public class JdbcPkGenerator implements PkGenerator {
}
// delete any existing pk entries
- runUpdate(node, pkDeleteString(dbEntities));
+ if (!dbEntities.isEmpty()) {
+ runUpdate(node, pkDeleteString(dbEntities));
+ }
// insert all needed entries
for (DbEntity ent : dbEntities) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
index c83399f..73da8a3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.inheritance_people.Address;
import org.apache.cayenne.testdo.inheritance_people.Department;
import org.apache.cayenne.testdo.inheritance_people.Manager;
import org.apache.cayenne.unit.di.server.CayenneProjects;
+import org.apache.cayenne.unit.di.server.DBCleaner;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Before;
@@ -50,6 +51,13 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
@Inject
private ObjectContext context;
+ @Inject
+ protected DBCleaner dbCleaner;
+
+ @Override
+ protected void setUpAfterInjection() throws Exception {
+ }
+
@Before
public void testSetUp() throws Exception {
@@ -64,6 +72,7 @@ public class DataContextEJBQLConditionsPeopleIT extends ServerCase {
// manually break circular deps
tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute();
+ dbCleaner.clean();
// TODO: use TableHelper to create test data
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
index 3d5b01e..e39fe21 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java
@@ -27,6 +27,7 @@ import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative;
import org.apache.cayenne.testdo.inheritance_people.Employee;
import org.apache.cayenne.testdo.inheritance_people.Manager;
import org.apache.cayenne.unit.di.server.CayenneProjects;
+import org.apache.cayenne.unit.di.server.DBCleaner;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Before;
@@ -46,11 +47,20 @@ public class DataContextEJBQLInheritanceIT extends ServerCase {
@Inject
protected DBHelper dbHelper;
+ @Inject
+ protected DBCleaner dbCleaner;
+
+ @Override
+ protected void setUpAfterInjection() throws Exception {
+ }
+
@Before
public void testSetUp() throws Exception {
// manually break circular deps
dbHelper.update("PERSON").set("DEPARTMENT_ID", null, Types.INTEGER).execute();
+ dbCleaner.clean();
+
TableHelper person = new TableHelper(dbHelper, "PERSON");
person.setColumns("PERSON_ID", "NAME", "PERSON_TYPE", "SALARY").setColumnTypes(Types.INTEGER, Types.VARCHAR,
Types.CHAR, Types.FLOAT);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
index d17e15e..41f9446 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java
@@ -39,6 +39,7 @@ import org.apache.cayenne.testdo.inheritance_people.PersonNotes;
import org.apache.cayenne.unit.di.DataChannelInterceptor;
import org.apache.cayenne.unit.di.UnitTestClosure;
import org.apache.cayenne.unit.di.server.CayenneProjects;
+import org.apache.cayenne.unit.di.server.DBCleaner;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
import org.junit.Before;
@@ -60,6 +61,9 @@ public class SingleTableInheritanceIT extends ServerCase {
private DBHelper dbHelper;
@Inject
+ private DBCleaner dbCleaner;
+
+ @Inject
private DataContext context;
@Inject
@@ -73,6 +77,10 @@ public class SingleTableInheritanceIT extends ServerCase {
private TableHelper tClientCompany;
private TableHelper tDepartment;
+ @Override
+ protected void setUpAfterInjection() throws Exception {
+ }
+
@Before
public void testSetUp() throws Exception {
tPerson = new TableHelper(dbHelper, "PERSON");
@@ -101,6 +109,7 @@ public class SingleTableInheritanceIT extends ServerCase {
// manually break circular deps
tPerson.update().set("DEPARTMENT_ID", null, Types.INTEGER).execute();
+ dbCleaner.clean();
}
private void create2PersonDataSet() throws Exception {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
index d44ac87..3bd680c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
@@ -39,23 +39,22 @@ public class DBCleaner {
public void clean() throws SQLException {
if (location.equals(CayenneProjects.TESTMAP_PROJECT)) {
- dbHelper.deleteAll("ARTGROUP");
- dbHelper.deleteAll("ARTIST");
- dbHelper.deleteAll("ARTIST_CT");
+ dbHelper.deleteAll("PAINTING_INFO");
+ dbHelper.deleteAll("PAINTING");
+ dbHelper.deleteAll("PAINTING1");
dbHelper.deleteAll("ARTIST_EXHIBIT");
dbHelper.deleteAll("ARTIST_GROUP");
+ dbHelper.deleteAll("ARTIST");
+ dbHelper.deleteAll("ARTGROUP");
dbHelper.deleteAll("EXHIBIT");
dbHelper.deleteAll("GALLERY");
+ dbHelper.deleteAll("ARTIST_CT");
dbHelper.deleteAll("GENERATED_COLUMN");
dbHelper.deleteAll("NULL_TEST");
- dbHelper.deleteAll("PAINTING");
- dbHelper.deleteAll("PAINTING1");
- dbHelper.deleteAll("PAINTING_INFO");
} else if (location.equals(CayenneProjects.MULTI_TIER_PROJECT)) {
- dbHelper.deleteAll("MT_JOIN45");
- dbHelper.deleteAll("MT_TABLE1");
dbHelper.deleteAll("MT_TABLE2");
- dbHelper.deleteAll("MT_TABLE3");
+ dbHelper.deleteAll("MT_TABLE1");
+ dbHelper.deleteAll("MT_JOIN45");
dbHelper.deleteAll("MT_TABLE4");
dbHelper.deleteAll("MT_TABLE5");
} else if (location.equals(CayenneProjects.COMPOUND_PROJECT)) {
@@ -65,13 +64,15 @@ public class DBCleaner {
dbHelper.deleteAll("COMPOUND_PK_TEST");
} else if (location.equals(CayenneProjects.PEOPLE_PROJECT)) {
dbHelper.deleteAll("ADDRESS");
- dbHelper.deleteAll("CLIENT_COMPANY");
dbHelper.deleteAll("DEPARTMENT");
- dbHelper.deleteAll("PERSON");
dbHelper.deleteAll("PERSON_NOTES");
- } else if(location.equals(CayenneProjects.BINARY_PK_PROJECT)) {
- dbHelper.deleteAll("BINARY_PK_TEST1");
- dbHelper.deleteAll("BINARY_PK_TEST2");
+ dbHelper.deleteAll("PERSON");
+ dbHelper.deleteAll("CLIENT_COMPANY");
+ } else if (location.equals(CayenneProjects.BINARY_PK_PROJECT)) {
+ if (accessStackAdapter.supportsBinaryPK()) {
+ dbHelper.deleteAll("BINARY_PK_TEST2");
+ dbHelper.deleteAll("BINARY_PK_TEST1");
+ }
} else if (location.equals(CayenneProjects.DATE_TIME_PROJECT)) {
dbHelper.deleteAll("CALENDAR_TEST");
dbHelper.deleteAll("DATE_TEST");
@@ -89,67 +90,67 @@ public class DBCleaner {
} else if (location.equals(CayenneProjects.EXTENDED_TYPE_PROJECT)) {
dbHelper.deleteAll("EXTENDED_TYPE_TEST");
} else if (location.equals(CayenneProjects.GENERATED_PROJECT)) {
- dbHelper.deleteAll("GENERATED_COLUMN_COMP_KEY");
- dbHelper.deleteAll("GENERATED_COLUMN_COMP_M");
+ dbHelper.deleteAll("GENERATED_JOIN");
+ dbHelper.deleteAll("GENERATED_F1");
+ dbHelper.deleteAll("GENERATED_F2");
dbHelper.deleteAll("GENERATED_COLUMN_DEP");
dbHelper.deleteAll("GENERATED_COLUMN_TEST");
dbHelper.deleteAll("GENERATED_COLUMN_TEST2");
- dbHelper.deleteAll("GENERATED_F1");
- dbHelper.deleteAll("GENERATED_F2");
- dbHelper.deleteAll("GENERATED_JOIN");
+ dbHelper.deleteAll("GENERATED_COLUMN_COMP_KEY");
+ dbHelper.deleteAll("GENERATED_COLUMN_COMP_M");
} else if (location.equals(CayenneProjects.GENERIC_PROJECT)) {
- dbHelper.deleteAll("GENERIC1");
dbHelper.deleteAll("GENERIC2");
+ dbHelper.deleteAll("GENERIC1");
} else if (location.equals(CayenneProjects.INHERITANCE_PROJECT)) {
dbHelper.deleteAll("BASE_ENTITY");
dbHelper.deleteAll("DIRECT_TO_SUB_ENTITY");
dbHelper.deleteAll("RELATED_ENTITY");
} else if (location.equals(CayenneProjects.INHERITANCE_SINGLE_TABLE1_PROJECT)) {
dbHelper.deleteAll("GROUP_MEMBERS");
+ dbHelper.deleteAll("USER_PROPERTIES");
dbHelper.deleteAll("GROUP_PROPERTIES");
dbHelper.deleteAll("ROLES");
- dbHelper.deleteAll("USER_PROPERTIES");
} else if (location.equals(CayenneProjects.INHERITANCE_VERTICAL_PROJECT)) {
- dbHelper.deleteAll("IV1_ROOT");
+ dbHelper.deleteAll("IV_SUB1_SUB1");
+ dbHelper.deleteAll("IV_SUB1");
+ dbHelper.deleteAll("IV_SUB2");
+ dbHelper.deleteAll("IV_ROOT");
dbHelper.deleteAll("IV1_SUB1");
- dbHelper.deleteAll("IV2_ROOT");
+ dbHelper.deleteAll("IV1_ROOT");
dbHelper.deleteAll("IV2_SUB1");
+ dbHelper.deleteAll("IV2_ROOT");
dbHelper.deleteAll("IV2_X");
- dbHelper.deleteAll("IV_ROOT");
- dbHelper.deleteAll("IV_SUB1");
- dbHelper.deleteAll("IV_SUB1_SUB1");
- dbHelper.deleteAll("IV_SUB2");
} else if (location.equals(CayenneProjects.LIFECYCLES_PROJECT)) {
dbHelper.deleteAll("LIFECYCLES");
} else if (location.equals(CayenneProjects.LOB_PROJECT)) {
+ dbHelper.deleteAll("CLOB_TEST_RELATION");
if (accessStackAdapter.supportsLobs()) {
dbHelper.deleteAll("BLOB_TEST");
dbHelper.deleteAll("CLOB_TEST");
}
- dbHelper.deleteAll("CLOB_TEST_RELATION");
dbHelper.deleteAll("TEST");
} else if (location.equals(CayenneProjects.LOCKING_PROJECT)) {
dbHelper.deleteAll("LOCKING_HELPER");
dbHelper.deleteAll("REL_LOCKING_TEST");
dbHelper.deleteAll("SIMPLE_LOCKING_TEST");
} else if (location.equals(CayenneProjects.MAP_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("ID_MAP_TO_MANY");
dbHelper.deleteAll("ID_MAP_TO_MANY_TARGET");
- dbHelper.deleteAll("MAP_TO_MANY");
+ dbHelper.deleteAll("ID_MAP_TO_MANY");
dbHelper.deleteAll("MAP_TO_MANY_TARGET");
+ dbHelper.deleteAll("MAP_TO_MANY");
} else if (location.equals(CayenneProjects.MEANINGFUL_PK_PROJECT)) {
dbHelper.deleteAll("MEANINGFUL_PK");
dbHelper.deleteAll("MEANINGFUL_PK_DEP");
dbHelper.deleteAll("MEANINGFUL_PK_TEST1");
} else if (location.equals(CayenneProjects.MISC_TYPES_PROJECT)) {
- dbHelper.deleteAll("ARRAYS_ENTITY");
- dbHelper.deleteAll("CHARACTER_ENTITY");
- if(accessStackAdapter.supportsLobs()) {
+ if (accessStackAdapter.supportsLobs()) {
dbHelper.deleteAll("SERIALIZABLE_ENTITY");
}
+ dbHelper.deleteAll("ARRAYS_ENTITY");
+ dbHelper.deleteAll("CHARACTER_ENTITY");
} else if (location.equals(CayenneProjects.MIXED_PERSISTENCE_STRATEGY_PROJECT)) {
- dbHelper.deleteAll("MIXED_PERSISTENCE_STRATEGY");
dbHelper.deleteAll("MIXED_PERSISTENCE_STRATEGY2");
+ dbHelper.deleteAll("MIXED_PERSISTENCE_STRATEGY");
} else if (location.equals(CayenneProjects.MULTINODE_PROJECT)) {
dbHelper.deleteAll("CROSSDB_M1E1");
dbHelper.deleteAll("CROSSDB_M2E1");
@@ -159,36 +160,36 @@ public class DBCleaner {
} else if (location.equals(CayenneProjects.NUMERIC_TYPES_PROJECT)) {
dbHelper.deleteAll("BIGDECIMAL_ENTITY");
dbHelper.deleteAll("BIGINTEGER_ENTITY");
- dbHelper.deleteAll("BIT_TEST");
dbHelper.deleteAll("BOOLEAN_TEST");
+ dbHelper.deleteAll("BIT_TEST");
+ dbHelper.deleteAll("SMALLINT_TEST");
+ dbHelper.deleteAll("TINYINT_TEST");
dbHelper.deleteAll("DECIMAL_PK_TST");
dbHelper.deleteAll("FLOAT_TEST");
dbHelper.deleteAll("LONG_ENTITY");
- dbHelper.deleteAll("SMALLINT_TEST");
- dbHelper.deleteAll("TINYINT_TEST");
} else if (location.equals(CayenneProjects.ONEWAY_PROJECT)) {
- dbHelper.deleteAll("oneway_table1");
dbHelper.deleteAll("oneway_table2");
- dbHelper.deleteAll("oneway_table3");
+ dbHelper.deleteAll("oneway_table1");
dbHelper.deleteAll("oneway_table4");
+ dbHelper.deleteAll("oneway_table3");
} else if (location.equals(CayenneProjects.PERSISTENT_PROJECT)) {
dbHelper.deleteAll("CONTINENT");
dbHelper.deleteAll("COUNTRY");
} else if (location.equals(CayenneProjects.PRIMITIVE_PROJECT)) {
dbHelper.deleteAll("PRIMITIVES_TEST");
} else if (location.equals(CayenneProjects.QUALIFIED_PROJECT)) {
- dbHelper.deleteAll("TEST_QUALIFIED1");
dbHelper.deleteAll("TEST_QUALIFIED2");
+ dbHelper.deleteAll("TEST_QUALIFIED1");
} else if (location.equals(CayenneProjects.QUOTED_IDENTIFIERS_PROJECT)) {
- dbHelper.deleteAll("QUOTED_ADDRESS");
dbHelper.deleteAll("quote Person");
+ dbHelper.deleteAll("QUOTED_ADDRESS");
} else if (location.equals(CayenneProjects.REFLEXIVE_PROJECT)) {
dbHelper.deleteAll("REFLEXIVE");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_PROJECT)) {
dbHelper.deleteAll("FK_OF_DIFFERENT_TYPE");
- dbHelper.deleteAll("MEANINGFUL_FK");
dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE");
dbHelper.deleteAll("RELATIONSHIP_HELPER");
+ dbHelper.deleteAll("MEANINGFUL_FK");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_ACTIVITY_PROJECT)) {
dbHelper.deleteAll("ACTIVITY");
dbHelper.deleteAll("RESULT");
@@ -199,26 +200,26 @@ public class DBCleaner {
dbHelper.deleteAll("CLOB_DETAIL");
dbHelper.deleteAll("CLOB_MASTER");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_COLLECTION_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("COLLECTION_TO_MANY");
dbHelper.deleteAll("COLLECTION_TO_MANY_TARGET");
+ dbHelper.deleteAll("COLLECTION_TO_MANY");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_DELETE_RULES_PROJECT)) {
- dbHelper.deleteAll("DELETE_RULE_FLATA");
- dbHelper.deleteAll("DELETE_RULE_FLATB");
- dbHelper.deleteAll("DELETE_RULE_JOIN");
+ dbHelper.deleteAll("DELETE_RULE_TEST3");
dbHelper.deleteAll("DELETE_RULE_TEST1");
dbHelper.deleteAll("DELETE_RULE_TEST2");
- dbHelper.deleteAll("DELETE_RULE_TEST3");
+ dbHelper.deleteAll("DELETE_RULE_JOIN");
+ dbHelper.deleteAll("DELETE_RULE_FLATB");
+ dbHelper.deleteAll("DELETE_RULE_FLATA");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_FLATTENED_PROJECT)) {
dbHelper.deleteAll("COMPLEX_JOIN");
- dbHelper.deleteAll("FLATTENED_CIRCULAR");
- dbHelper.deleteAll("FLATTENED_CIRCULAR_JOIN");
- dbHelper.deleteAll("FLATTENED_TEST_1");
- dbHelper.deleteAll("FLATTENED_TEST_2");
- dbHelper.deleteAll("FLATTENED_TEST_3");
dbHelper.deleteAll("FLATTENED_TEST_4");
+ dbHelper.deleteAll("FLATTENED_TEST_3");
+ dbHelper.deleteAll("FLATTENED_TEST_2");
+ dbHelper.deleteAll("FLATTENED_TEST_1");
+ dbHelper.deleteAll("FLATTENED_CIRCULAR_JOIN");
+ dbHelper.deleteAll("FLATTENED_CIRCULAR");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_SET_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("SET_TO_MANY");
dbHelper.deleteAll("SET_TO_MANY_TARGET");
+ dbHelper.deleteAll("SET_TO_MANY");
} else if (location.equals(CayenneProjects.RELATIONSHIPS_TO_MANY_FK_PROJECT)) {
dbHelper.deleteAll("TO_MANY_FKDEP");
dbHelper.deleteAll("TO_MANY_FKROOT");
@@ -239,18 +240,18 @@ public class DBCleaner {
} else if (location.equals(CayenneProjects.TABLE_PRIMITIVES_PROJECT)) {
dbHelper.deleteAll("TABLE_PRIMITIVES");
} else if (location.equals(CayenneProjects.THINGS_PROJECT)) {
- dbHelper.deleteAll("BAG");
dbHelper.deleteAll("BALL");
- dbHelper.deleteAll("BOX");
- dbHelper.deleteAll("BOX_INFO");
dbHelper.deleteAll("BOX_THING");
dbHelper.deleteAll("THING");
+ dbHelper.deleteAll("BOX_INFO");
+ dbHelper.deleteAll("BOX");
+ dbHelper.deleteAll("BAG");
} else if (location.equals(CayenneProjects.TOONE_PROJECT)) {
dbHelper.deleteAll("TOONE_DEP");
dbHelper.deleteAll("TOONE_MASTER");
} else if (location.equals(CayenneProjects.UUID_PROJECT)) {
- dbHelper.deleteAll("UUID_PK_ENTITY");
dbHelper.deleteAll("UUID_TEST");
+ dbHelper.deleteAll("UUID_PK_ENTITY");
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/df3494b6/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
index 4204412..d0e57b9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/DeepMergeOperationInheritanceIT.java
@@ -50,6 +50,10 @@ public class DeepMergeOperationInheritanceIT extends ServerCase {
@Inject
protected DataChannelInterceptor queryInterceptor;
+ @Override
+ protected void setUpAfterInjection() throws Exception {
+ }
+
@Test
public void testDeepMergeExistingSubclass() {
[3/4] cayenne git commit: improve DBCleaner with filtering
Posted by aa...@apache.org.
improve DBCleaner with filtering
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/62d137cf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/62d137cf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/62d137cf
Branch: refs/heads/master
Commit: 62d137cf71ca740a852007f90a5631618866f81d
Parents: a5559d7
Author: Savva Kolbechev <s....@gmail.com>
Authored: Wed Nov 19 18:44:00 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Wed Nov 19 18:44:00 2014 +0300
----------------------------------------------------------------------
.../cayenne/unit/di/server/DBCleaner.java | 55 +++++---------------
.../unit/di/server/DBCleanerProvider.java | 5 +-
.../cayenne/unit/di/server/SchemaBuilder.java | 24 ++++++---
3 files changed, 30 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/62d137cf/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
index e28525b..2bd5cc3 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.unit.di.server;
-import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.ConfigurationTree;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader;
@@ -32,70 +31,40 @@ import org.apache.cayenne.unit.UnitDbAdapter;
import java.net.URL;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
public class DBCleaner {
private FlavoredDBHelper dbHelper;
private String location;
- private DataDomain domain;
private XMLDataChannelDescriptorLoader loader;
@Inject
+ private SchemaBuilder schemaBuilder;
+
+ @Inject
private UnitDbAdapter accessStackAdapter;
@Inject
private Injector injector;
- public DBCleaner(FlavoredDBHelper dbHelper, DataDomain dataDomain, String location) {
+ public DBCleaner(FlavoredDBHelper dbHelper, String location) {
this.dbHelper = dbHelper;
this.location = location;
- this.domain = dataDomain;
}
public void clean() throws SQLException {
- if (location.equals(CayenneProjects.BINARY_PK_PROJECT)) {
- if (accessStackAdapter.supportsBinaryPK()) {
- dbHelper.deleteAll("BINARY_PK_TEST2");
- dbHelper.deleteAll("BINARY_PK_TEST1");
- }
- } else if (location.equals(CayenneProjects.EMPTY_PROJECT)) {
- return;
- } else if (location.equals(CayenneProjects.LOB_PROJECT)) {
- dbHelper.deleteAll("CLOB_TEST_RELATION");
- if (accessStackAdapter.supportsLobs()) {
- dbHelper.deleteAll("BLOB_TEST");
- dbHelper.deleteAll("CLOB_TEST");
- }
- dbHelper.deleteAll("TEST");
- } else if (location.equals(CayenneProjects.MISC_TYPES_PROJECT)) {
- if (accessStackAdapter.supportsLobs()) {
- dbHelper.deleteAll("SERIALIZABLE_ENTITY");
- }
- dbHelper.deleteAll("ARRAYS_ENTITY");
- dbHelper.deleteAll("CHARACTER_ENTITY");
- } else if (location.equals(CayenneProjects.RETURN_TYPES_PROJECT)) {
- if (accessStackAdapter.supportsLobs()) {
- dbHelper.deleteAll("TYPES_MAPPING_LOBS_TEST1");
- dbHelper.deleteAll("TYPES_MAPPING_TEST2");
- }
- dbHelper.deleteAll("TYPES_MAPPING_TEST1");
- } else {
- loader = new XMLDataChannelDescriptorLoader();
- injector.injectMembers(loader);
+ loader = new XMLDataChannelDescriptorLoader();
+ injector.injectMembers(loader);
- URL url = getClass().getClassLoader().getResource(location);
- ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));
+ URL url = getClass().getClassLoader().getResource(location);
+ ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));
- for (DataMap map : tree.getRootNode().getDataMaps()) {
- DataMap dataMap = domain.getDataMap(map.getName());
- List<DbEntity> entities = new ArrayList<DbEntity>(dataMap.getDbEntities());
- domain.getEntitySorter().sortDbEntities(entities, true);
+ for (DataMap map : tree.getRootNode().getDataMaps()) {
+ List<DbEntity> entities = schemaBuilder.dbEntitiesInDeleteOrder(map);
- for (DbEntity entity : entities) {
- dbHelper.deleteAll(entity.getName());
- }
+ for (DbEntity entity : entities) {
+ dbHelper.deleteAll(entity.getName());
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/62d137cf/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
index ff579b4..86b5e86 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
@@ -32,12 +32,9 @@ public class DBCleanerProvider implements Provider<DBCleaner> {
@Inject
protected Provider<ServerCaseProperties> propertiesProvider;
- @Inject
- private SchemaBuilder schemaBuilder;
-
@Override
public DBCleaner get() throws ConfigurationException {
- return new DBCleaner((FlavoredDBHelper) dbHelper, schemaBuilder.getDomain(), propertiesProvider.get().getConfigurationLocation());
+ return new DBCleaner((FlavoredDBHelper) dbHelper, propertiesProvider.get().getConfigurationLocation());
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/62d137cf/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
index 02bd5fe..880f697 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
@@ -203,6 +203,23 @@ public class SchemaBuilder {
private List<DbEntity> dbEntitiesInInsertOrder(DataNode node, DataMap map) {
List<DbEntity> entities = new ArrayList<DbEntity>(map.getDbEntities());
+ dbEntitiesFilter(entities);
+
+ domain.getEntitySorter().sortDbEntities(entities, false);
+ return entities;
+ }
+
+ protected List<DbEntity> dbEntitiesInDeleteOrder(DataMap dataMap) {
+ DataMap map = domain.getDataMap(dataMap.getName());
+ List<DbEntity> entities = new ArrayList<DbEntity>(map.getDbEntities());
+
+ dbEntitiesFilter(entities);
+
+ domain.getEntitySorter().sortDbEntities(entities, true);
+ return entities;
+ }
+
+ private void dbEntitiesFilter(List<DbEntity> entities) {
// filter various unsupported tests...
// LOBs
@@ -258,9 +275,6 @@ public class SchemaBuilder {
entities = filtered;
}
-
- domain.getEntitySorter().sortDbEntities(entities, false);
- return entities;
}
private void dropSchema(DataNode node, DataMap map) throws Exception {
@@ -367,8 +381,4 @@ public class SchemaBuilder {
return queries;
}
- protected DataDomain getDomain() {
- return domain;
- }
-
}
[2/4] cayenne git commit: improve DBCleaner without filtering
Posted by aa...@apache.org.
improve DBCleaner without filtering
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a5559d7d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a5559d7d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a5559d7d
Branch: refs/heads/master
Commit: a5559d7d4b7e55725e15b64068f2b41596060075
Parents: df3494b
Author: Savva Kolbechev <s....@gmail.com>
Authored: Wed Nov 19 18:03:30 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Wed Nov 19 18:03:30 2014 +0300
----------------------------------------------------------------------
.../cayenne/unit/di/server/DBCleaner.java | 225 +++----------------
.../unit/di/server/DBCleanerProvider.java | 5 +-
.../cayenne/unit/di/server/SchemaBuilder.java | 5 +
.../unit/di/server/ServerCaseModule.java | 6 +
4 files changed, 50 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a5559d7d/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
index 3bd680c..e28525b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleaner.java
@@ -19,109 +19,49 @@
package org.apache.cayenne.unit.di.server;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.configuration.ConfigurationTree;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader;
import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.unit.UnitDbAdapter;
+import java.net.URL;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
public class DBCleaner {
private FlavoredDBHelper dbHelper;
private String location;
+ private DataDomain domain;
+ private XMLDataChannelDescriptorLoader loader;
@Inject
private UnitDbAdapter accessStackAdapter;
- public DBCleaner(FlavoredDBHelper dbHelper, String location) {
+ @Inject
+ private Injector injector;
+
+ public DBCleaner(FlavoredDBHelper dbHelper, DataDomain dataDomain, String location) {
this.dbHelper = dbHelper;
this.location = location;
+ this.domain = dataDomain;
}
public void clean() throws SQLException {
- if (location.equals(CayenneProjects.TESTMAP_PROJECT)) {
- dbHelper.deleteAll("PAINTING_INFO");
- dbHelper.deleteAll("PAINTING");
- dbHelper.deleteAll("PAINTING1");
- dbHelper.deleteAll("ARTIST_EXHIBIT");
- dbHelper.deleteAll("ARTIST_GROUP");
- dbHelper.deleteAll("ARTIST");
- dbHelper.deleteAll("ARTGROUP");
- dbHelper.deleteAll("EXHIBIT");
- dbHelper.deleteAll("GALLERY");
- dbHelper.deleteAll("ARTIST_CT");
- dbHelper.deleteAll("GENERATED_COLUMN");
- dbHelper.deleteAll("NULL_TEST");
- } else if (location.equals(CayenneProjects.MULTI_TIER_PROJECT)) {
- dbHelper.deleteAll("MT_TABLE2");
- dbHelper.deleteAll("MT_TABLE1");
- dbHelper.deleteAll("MT_JOIN45");
- dbHelper.deleteAll("MT_TABLE4");
- dbHelper.deleteAll("MT_TABLE5");
- } else if (location.equals(CayenneProjects.COMPOUND_PROJECT)) {
- dbHelper.deleteAll("CHAR_FK_TEST");
- dbHelper.deleteAll("CHAR_PK_TEST");
- dbHelper.deleteAll("COMPOUND_FK_TEST");
- dbHelper.deleteAll("COMPOUND_PK_TEST");
- } else if (location.equals(CayenneProjects.PEOPLE_PROJECT)) {
- dbHelper.deleteAll("ADDRESS");
- dbHelper.deleteAll("DEPARTMENT");
- dbHelper.deleteAll("PERSON_NOTES");
- dbHelper.deleteAll("PERSON");
- dbHelper.deleteAll("CLIENT_COMPANY");
- } else if (location.equals(CayenneProjects.BINARY_PK_PROJECT)) {
+ if (location.equals(CayenneProjects.BINARY_PK_PROJECT)) {
if (accessStackAdapter.supportsBinaryPK()) {
dbHelper.deleteAll("BINARY_PK_TEST2");
dbHelper.deleteAll("BINARY_PK_TEST1");
}
- } else if (location.equals(CayenneProjects.DATE_TIME_PROJECT)) {
- dbHelper.deleteAll("CALENDAR_TEST");
- dbHelper.deleteAll("DATE_TEST");
- } else if (location.equals(CayenneProjects.DELETE_RULES_PROJECT)) {
- dbHelper.deleteAll("DELETE_CASCADE");
- dbHelper.deleteAll("DELETE_DENY");
- dbHelper.deleteAll("DELETE_NULLIFY");
- dbHelper.deleteAll("DELETE_RULE");
- } else if (location.equals(CayenneProjects.EMBEDDABLE_PROJECT)) {
- dbHelper.deleteAll("EMBED_ENTITY1");
} else if (location.equals(CayenneProjects.EMPTY_PROJECT)) {
return;
- } else if (location.equals(CayenneProjects.ENUM_PROJECT)) {
- dbHelper.deleteAll("ENUM_ENTITY");
- } else if (location.equals(CayenneProjects.EXTENDED_TYPE_PROJECT)) {
- dbHelper.deleteAll("EXTENDED_TYPE_TEST");
- } else if (location.equals(CayenneProjects.GENERATED_PROJECT)) {
- dbHelper.deleteAll("GENERATED_JOIN");
- dbHelper.deleteAll("GENERATED_F1");
- dbHelper.deleteAll("GENERATED_F2");
- dbHelper.deleteAll("GENERATED_COLUMN_DEP");
- dbHelper.deleteAll("GENERATED_COLUMN_TEST");
- dbHelper.deleteAll("GENERATED_COLUMN_TEST2");
- dbHelper.deleteAll("GENERATED_COLUMN_COMP_KEY");
- dbHelper.deleteAll("GENERATED_COLUMN_COMP_M");
- } else if (location.equals(CayenneProjects.GENERIC_PROJECT)) {
- dbHelper.deleteAll("GENERIC2");
- dbHelper.deleteAll("GENERIC1");
- } else if (location.equals(CayenneProjects.INHERITANCE_PROJECT)) {
- dbHelper.deleteAll("BASE_ENTITY");
- dbHelper.deleteAll("DIRECT_TO_SUB_ENTITY");
- dbHelper.deleteAll("RELATED_ENTITY");
- } else if (location.equals(CayenneProjects.INHERITANCE_SINGLE_TABLE1_PROJECT)) {
- dbHelper.deleteAll("GROUP_MEMBERS");
- dbHelper.deleteAll("USER_PROPERTIES");
- dbHelper.deleteAll("GROUP_PROPERTIES");
- dbHelper.deleteAll("ROLES");
- } else if (location.equals(CayenneProjects.INHERITANCE_VERTICAL_PROJECT)) {
- dbHelper.deleteAll("IV_SUB1_SUB1");
- dbHelper.deleteAll("IV_SUB1");
- dbHelper.deleteAll("IV_SUB2");
- dbHelper.deleteAll("IV_ROOT");
- dbHelper.deleteAll("IV1_SUB1");
- dbHelper.deleteAll("IV1_ROOT");
- dbHelper.deleteAll("IV2_SUB1");
- dbHelper.deleteAll("IV2_ROOT");
- dbHelper.deleteAll("IV2_X");
- } else if (location.equals(CayenneProjects.LIFECYCLES_PROJECT)) {
- dbHelper.deleteAll("LIFECYCLES");
} else if (location.equals(CayenneProjects.LOB_PROJECT)) {
dbHelper.deleteAll("CLOB_TEST_RELATION");
if (accessStackAdapter.supportsLobs()) {
@@ -129,129 +69,34 @@ public class DBCleaner {
dbHelper.deleteAll("CLOB_TEST");
}
dbHelper.deleteAll("TEST");
- } else if (location.equals(CayenneProjects.LOCKING_PROJECT)) {
- dbHelper.deleteAll("LOCKING_HELPER");
- dbHelper.deleteAll("REL_LOCKING_TEST");
- dbHelper.deleteAll("SIMPLE_LOCKING_TEST");
- } else if (location.equals(CayenneProjects.MAP_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("ID_MAP_TO_MANY_TARGET");
- dbHelper.deleteAll("ID_MAP_TO_MANY");
- dbHelper.deleteAll("MAP_TO_MANY_TARGET");
- dbHelper.deleteAll("MAP_TO_MANY");
- } else if (location.equals(CayenneProjects.MEANINGFUL_PK_PROJECT)) {
- dbHelper.deleteAll("MEANINGFUL_PK");
- dbHelper.deleteAll("MEANINGFUL_PK_DEP");
- dbHelper.deleteAll("MEANINGFUL_PK_TEST1");
} else if (location.equals(CayenneProjects.MISC_TYPES_PROJECT)) {
if (accessStackAdapter.supportsLobs()) {
dbHelper.deleteAll("SERIALIZABLE_ENTITY");
}
dbHelper.deleteAll("ARRAYS_ENTITY");
dbHelper.deleteAll("CHARACTER_ENTITY");
- } else if (location.equals(CayenneProjects.MIXED_PERSISTENCE_STRATEGY_PROJECT)) {
- dbHelper.deleteAll("MIXED_PERSISTENCE_STRATEGY2");
- dbHelper.deleteAll("MIXED_PERSISTENCE_STRATEGY");
- } else if (location.equals(CayenneProjects.MULTINODE_PROJECT)) {
- dbHelper.deleteAll("CROSSDB_M1E1");
- dbHelper.deleteAll("CROSSDB_M2E1");
- dbHelper.deleteAll("CROSSDB_M2E2");
- } else if (location.equals(CayenneProjects.NO_PK_PROJECT)) {
- dbHelper.deleteAll("NO_PK_TEST");
- } else if (location.equals(CayenneProjects.NUMERIC_TYPES_PROJECT)) {
- dbHelper.deleteAll("BIGDECIMAL_ENTITY");
- dbHelper.deleteAll("BIGINTEGER_ENTITY");
- dbHelper.deleteAll("BOOLEAN_TEST");
- dbHelper.deleteAll("BIT_TEST");
- dbHelper.deleteAll("SMALLINT_TEST");
- dbHelper.deleteAll("TINYINT_TEST");
- dbHelper.deleteAll("DECIMAL_PK_TST");
- dbHelper.deleteAll("FLOAT_TEST");
- dbHelper.deleteAll("LONG_ENTITY");
- } else if (location.equals(CayenneProjects.ONEWAY_PROJECT)) {
- dbHelper.deleteAll("oneway_table2");
- dbHelper.deleteAll("oneway_table1");
- dbHelper.deleteAll("oneway_table4");
- dbHelper.deleteAll("oneway_table3");
- } else if (location.equals(CayenneProjects.PERSISTENT_PROJECT)) {
- dbHelper.deleteAll("CONTINENT");
- dbHelper.deleteAll("COUNTRY");
- } else if (location.equals(CayenneProjects.PRIMITIVE_PROJECT)) {
- dbHelper.deleteAll("PRIMITIVES_TEST");
- } else if (location.equals(CayenneProjects.QUALIFIED_PROJECT)) {
- dbHelper.deleteAll("TEST_QUALIFIED2");
- dbHelper.deleteAll("TEST_QUALIFIED1");
- } else if (location.equals(CayenneProjects.QUOTED_IDENTIFIERS_PROJECT)) {
- dbHelper.deleteAll("quote Person");
- dbHelper.deleteAll("QUOTED_ADDRESS");
- } else if (location.equals(CayenneProjects.REFLEXIVE_PROJECT)) {
- dbHelper.deleteAll("REFLEXIVE");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_PROJECT)) {
- dbHelper.deleteAll("FK_OF_DIFFERENT_TYPE");
- dbHelper.deleteAll("REFLEXIVE_AND_TO_ONE");
- dbHelper.deleteAll("RELATIONSHIP_HELPER");
- dbHelper.deleteAll("MEANINGFUL_FK");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_ACTIVITY_PROJECT)) {
- dbHelper.deleteAll("ACTIVITY");
- dbHelper.deleteAll("RESULT");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_CHILD_MASTER_PROJECT)) {
- dbHelper.deleteAll("CHILD");
- dbHelper.deleteAll("MASTER");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_CLOB_PROJECT)) {
- dbHelper.deleteAll("CLOB_DETAIL");
- dbHelper.deleteAll("CLOB_MASTER");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_COLLECTION_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("COLLECTION_TO_MANY_TARGET");
- dbHelper.deleteAll("COLLECTION_TO_MANY");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_DELETE_RULES_PROJECT)) {
- dbHelper.deleteAll("DELETE_RULE_TEST3");
- dbHelper.deleteAll("DELETE_RULE_TEST1");
- dbHelper.deleteAll("DELETE_RULE_TEST2");
- dbHelper.deleteAll("DELETE_RULE_JOIN");
- dbHelper.deleteAll("DELETE_RULE_FLATB");
- dbHelper.deleteAll("DELETE_RULE_FLATA");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_FLATTENED_PROJECT)) {
- dbHelper.deleteAll("COMPLEX_JOIN");
- dbHelper.deleteAll("FLATTENED_TEST_4");
- dbHelper.deleteAll("FLATTENED_TEST_3");
- dbHelper.deleteAll("FLATTENED_TEST_2");
- dbHelper.deleteAll("FLATTENED_TEST_1");
- dbHelper.deleteAll("FLATTENED_CIRCULAR_JOIN");
- dbHelper.deleteAll("FLATTENED_CIRCULAR");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_SET_TO_MANY_PROJECT)) {
- dbHelper.deleteAll("SET_TO_MANY_TARGET");
- dbHelper.deleteAll("SET_TO_MANY");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_TO_MANY_FK_PROJECT)) {
- dbHelper.deleteAll("TO_MANY_FKDEP");
- dbHelper.deleteAll("TO_MANY_FKROOT");
- dbHelper.deleteAll("TO_MANY_ROOT2");
- } else if (location.equals(CayenneProjects.RELATIONSHIPS_TO_ONE_FK_PROJECT)) {
- dbHelper.deleteAll("TO_ONE_FK1");
- dbHelper.deleteAll("TO_ONE_FK2");
} else if (location.equals(CayenneProjects.RETURN_TYPES_PROJECT)) {
if (accessStackAdapter.supportsLobs()) {
dbHelper.deleteAll("TYPES_MAPPING_LOBS_TEST1");
dbHelper.deleteAll("TYPES_MAPPING_TEST2");
}
dbHelper.deleteAll("TYPES_MAPPING_TEST1");
- } else if (location.equals(CayenneProjects.SOFT_DELETE_PROJECT)) {
- dbHelper.deleteAll("SOFT_DELETE");
- } else if (location.equals(CayenneProjects.SUS_PROJECT)) {
- return;
- } else if (location.equals(CayenneProjects.TABLE_PRIMITIVES_PROJECT)) {
- dbHelper.deleteAll("TABLE_PRIMITIVES");
- } else if (location.equals(CayenneProjects.THINGS_PROJECT)) {
- dbHelper.deleteAll("BALL");
- dbHelper.deleteAll("BOX_THING");
- dbHelper.deleteAll("THING");
- dbHelper.deleteAll("BOX_INFO");
- dbHelper.deleteAll("BOX");
- dbHelper.deleteAll("BAG");
- } else if (location.equals(CayenneProjects.TOONE_PROJECT)) {
- dbHelper.deleteAll("TOONE_DEP");
- dbHelper.deleteAll("TOONE_MASTER");
- } else if (location.equals(CayenneProjects.UUID_PROJECT)) {
- dbHelper.deleteAll("UUID_TEST");
- dbHelper.deleteAll("UUID_PK_ENTITY");
+ } else {
+ loader = new XMLDataChannelDescriptorLoader();
+ injector.injectMembers(loader);
+
+ URL url = getClass().getClassLoader().getResource(location);
+ ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));
+
+ for (DataMap map : tree.getRootNode().getDataMaps()) {
+ DataMap dataMap = domain.getDataMap(map.getName());
+ List<DbEntity> entities = new ArrayList<DbEntity>(dataMap.getDbEntities());
+ domain.getEntitySorter().sortDbEntities(entities, true);
+
+ for (DbEntity entity : entities) {
+ dbHelper.deleteAll(entity.getName());
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a5559d7d/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
index 86b5e86..ff579b4 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/DBCleanerProvider.java
@@ -32,9 +32,12 @@ public class DBCleanerProvider implements Provider<DBCleaner> {
@Inject
protected Provider<ServerCaseProperties> propertiesProvider;
+ @Inject
+ private SchemaBuilder schemaBuilder;
+
@Override
public DBCleaner get() throws ConfigurationException {
- return new DBCleaner((FlavoredDBHelper) dbHelper, propertiesProvider.get().getConfigurationLocation());
+ return new DBCleaner((FlavoredDBHelper) dbHelper, schemaBuilder.getDomain(), propertiesProvider.get().getConfigurationLocation());
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a5559d7d/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
index a497e0d..02bd5fe 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
@@ -366,4 +366,9 @@ public class SchemaBuilder {
return queries;
}
+
+ protected DataDomain getDomain() {
+ return domain;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a5559d7d/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
index 4bf0bbb..b24aef9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
@@ -42,11 +42,15 @@ import org.apache.cayenne.access.types.TimestampType;
import org.apache.cayenne.access.types.UUIDType;
import org.apache.cayenne.access.types.UtilDateType;
import org.apache.cayenne.access.types.VoidType;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.Constants;
+import org.apache.cayenne.configuration.DataMapLoader;
+import org.apache.cayenne.configuration.DefaultConfigurationNameMapper;
import org.apache.cayenne.configuration.DefaultObjectStoreFactory;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.ObjectStoreFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
+import org.apache.cayenne.configuration.XMLDataMapLoader;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.conn.DataSourceInfo;
@@ -208,6 +212,8 @@ public class ServerCaseModule implements Module {
binder.bind(AdhocObjectFactory.class).to(DefaultAdhocObjectFactory.class);
binder.bind(ResourceLocator.class).to(ClassLoaderResourceLocator.class);
binder.bind(ObjectStoreFactory.class).to(DefaultObjectStoreFactory.class);
+ binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
+ binder.bind(ConfigurationNameMapper.class).to(DefaultConfigurationNameMapper.class);
// test-scoped objects
binder.bind(EntityResolver.class).toProvider(
[4/4] cayenne git commit: fix procedure names
Posted by aa...@apache.org.
fix procedure names
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/177a25bd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/177a25bd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/177a25bd
Branch: refs/heads/master
Commit: 177a25bd8f6ebb9323fa6918a4c1364f04ba8f35
Parents: 62d137c
Author: Savva Kolbechev <s....@gmail.com>
Authored: Fri Nov 21 14:58:27 2014 +0300
Committer: Savva Kolbechev <s....@gmail.com>
Committed: Fri Nov 21 14:58:27 2014 +0300
----------------------------------------------------------------------
.../cayenne/access/DataContextProcedureQueryIT.java | 8 ++++----
.../java/org/apache/cayenne/map/MapLoaderLoadTest.java | 2 +-
.../java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java | 2 +-
.../java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java | 4 ++--
.../java/org/apache/cayenne/unit/OracleUnitDbAdapter.java | 2 +-
.../org/apache/cayenne/unit/PostgresUnitDbAdapter.java | 2 +-
.../java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java | 4 ++--
cayenne-server/src/test/resources/testmap.map.xml | 10 +++++-----
8 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
index 423047b..d8e6b0b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextProcedureQueryIT.java
@@ -51,10 +51,10 @@ import static org.junit.Assert.assertTrue;
@UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
public class DataContextProcedureQueryIT extends ServerCase {
- public static final String UPDATE_STORED_PROCEDURE = "cayenne_test_upd_proc";
- public static final String UPDATE_STORED_PROCEDURE_NOPARAM = "cayenne_test_upd_proc2";
- public static final String SELECT_STORED_PROCEDURE = "cayenne_test_select_proc";
- public static final String OUT_STORED_PROCEDURE = "cayenne_test_out_proc";
+ public static final String UPDATE_STORED_PROCEDURE = "cayenne_tst_upd_proc";
+ public static final String UPDATE_STORED_PROCEDURE_NOPARAM = "cayenne_tst_upd_proc2";
+ public static final String SELECT_STORED_PROCEDURE = "cayenne_tst_select_proc";
+ public static final String OUT_STORED_PROCEDURE = "cayenne_tst_out_proc";
@Inject
private DataContext context;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
index 4e078e6..de5053c 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/MapLoaderLoadTest.java
@@ -95,7 +95,7 @@ public class MapLoaderLoadTest {
assertNotNull(map);
// test procedures
- Procedure procedure = map.getProcedure("cayenne_test_upd_proc");
+ Procedure procedure = map.getProcedure("cayenne_tst_upd_proc");
assertNotNull(procedure);
List<ProcedureParameter> params = procedure.getCallParameters();
assertNotNull(params);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
index 10ae06c..c78791f 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/HSQLDBUnitDbAdapter.java
@@ -52,7 +52,7 @@ public class HSQLDBUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "hsqldb", "create-sp-aliases.sql");
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
index 61d7cbb..2ada884 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/MySQLUnitDbAdapter.java
@@ -91,7 +91,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "mysql", "create-select-sp.sql");
executeDDL(con, "mysql", "create-update-sp.sql");
executeDDL(con, "mysql", "create-update-sp2.sql");
@@ -105,7 +105,7 @@ public class MySQLUnitDbAdapter extends UnitDbAdapter {
DataMap map,
Collection<String> tablesToDrop) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(conn, "mysql", "drop-select-sp.sql");
executeDDL(conn, "mysql", "drop-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
index 38dcee2..f0ebb94 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/OracleUnitDbAdapter.java
@@ -80,7 +80,7 @@ public class OracleUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "oracle", "create-types-pkg.sql");
executeDDL(con, "oracle", "create-select-sp.sql");
executeDDL(con, "oracle", "create-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
index 794f799..4042979 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/PostgresUnitDbAdapter.java
@@ -54,7 +54,7 @@ public class PostgresUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- if (map.getProcedureMap().containsKey("cayenne_test_select_proc")) {
+ if (map.getProcedureMap().containsKey("cayenne_tst_select_proc")) {
executeDDL(con, "postgresql", "create-select-sp.sql");
executeDDL(con, "postgresql", "create-update-sp.sql");
executeDDL(con, "postgresql", "create-update-sp2.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
index 0e33821..559ca4d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/SybaseUnitDbAdapter.java
@@ -55,7 +55,7 @@ public class SybaseUnitDbAdapter extends UnitDbAdapter {
@Override
public void createdTables(Connection con, DataMap map) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(con, "sybase", "create-select-sp.sql");
executeDDL(con, "sybase", "create-update-sp.sql");
@@ -116,7 +116,7 @@ public class SybaseUnitDbAdapter extends UnitDbAdapter {
}
protected void dropProcedures(Connection con, DataMap map) throws Exception {
- Procedure proc = map.getProcedure("cayenne_test_select_proc");
+ Procedure proc = map.getProcedure("cayenne_tst_select_proc");
if (proc != null && proc.getDataMap() == map) {
executeDDL(con, "sybase", "drop-select-sp.sql");
executeDDL(con, "sybase", "drop-update-sp.sql");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/177a25bd/cayenne-server/src/test/resources/testmap.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/testmap.map.xml b/cayenne-server/src/test/resources/testmap.map.xml
index 52a8a67..d64eb79 100644
--- a/cayenne-server/src/test/resources/testmap.map.xml
+++ b/cayenne-server/src/test/resources/testmap.map.xml
@@ -8,18 +8,18 @@
<property name="clientSupported" value="true"/>
<property name="defaultClientPackage" value="test.client"/>
<property name="defaultClientSuperclass" value="org.apache.cayenne.PersistentObject"/>
- <procedure name="cayenne_test_out_proc">
+ <procedure name="cayenne_tst_out_proc">
<procedure-parameter name="in_param" type="INTEGER" direction="in"/>
<procedure-parameter name="out_param" type="INTEGER" direction="out"/>
</procedure>
- <procedure name="cayenne_test_select_proc">
+ <procedure name="cayenne_tst_select_proc">
<procedure-parameter name="aName" type="VARCHAR" length="254" direction="in"/>
<procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/>
</procedure>
- <procedure name="cayenne_test_upd_proc">
+ <procedure name="cayenne_tst_upd_proc">
<procedure-parameter name="paintingPrice" type="INTEGER" direction="in"/>
</procedure>Ï
- <procedure name="cayenne_test_upd_proc2">
+ <procedure name="cayenne_tst_upd_proc2">
</procedure>
<db-entity name="ARTGROUP">
<db-attribute name="GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -271,7 +271,7 @@ VALUES (#bind($id), #bind($title), #bind($price))]]></sql>
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="SHARED_CACHE"/>
<qualifier><![CDATA[artistName like $name]]></qualifier>
</query>
- <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_test_select_proc" result-entity="Artist">
+ <query name="ProcedureQuery" factory="org.apache.cayenne.map.ProcedureQueryBuilder" root="procedure" root-name="cayenne_tst_select_proc" result-entity="Artist">
</query>
<query name="QueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="Artist">
<property name="cayenne.GenericSelectQuery.cacheStrategy" value="LOCAL_CACHE"/>