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 2006/05/22 03:42:26 UTC
svn commit: r408548 - in
/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main:
java/org/apache/cayenne/profile/ java/org/apache/cayenne/profile/cases/
java/org/apache/cayenne/profile/entity/ java/org/apache/cayenne/profi...
Author: aadamchik
Date: Sun May 21 18:42:25 2006
New Revision: 408548
URL: http://svn.apache.org/viewvc?rev=408548&view=rev
Log:
adding setup profile case.
merging new cases to 1.1 branch
Added:
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/InsertWithRelationshipCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/MixedCommitCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/ResolveToOneRelationshipCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/SetupCase.java
- copied, changed from r408500, incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/DeleteCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/UpdateAttributeCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity2.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity3.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity2.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity3.java
Removed:
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/DeleteCase.java
Modified:
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/AbstractCase.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/servlet/ProfileFilter.java
incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/resources/regression-profile.map.xml
Modified: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/AbstractCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/AbstractCase.java?rev=408548&r1=408547&r2=408548&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/AbstractCase.java (original)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/AbstractCase.java Sun May 21 18:42:25 2006
@@ -27,7 +27,7 @@
*
* @author Andrus Adamchik
*/
-public class AbstractCase extends TestCase {
+public abstract class AbstractCase extends TestCase {
public void doGet(
DataContext context,
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/InsertWithRelationshipCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/InsertWithRelationshipCase.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/InsertWithRelationshipCase.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/InsertWithRelationshipCase.java Sun May 21 18:42:25 2006
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cayenne.profile.cases;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cayenne.profile.AbstractCase;
+import org.apache.cayenne.profile.entity.Entity2;
+import org.apache.cayenne.profile.entity.Entity3;
+import org.objectstyle.cayenne.access.DataContext;
+
+public class InsertWithRelationshipCase extends AbstractCase {
+
+ protected void doRequest(
+ DataContext context,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ for (int i = 0; i < 500; i++) {
+ Entity2 e = (Entity2) context.createAndRegisterNewObject(Entity2.class);
+ e.setName("Name_" + i);
+
+ Entity3 e31 = (Entity3) context.createAndRegisterNewObject(Entity3.class);
+ e31.setName("E31_" + i);
+ e31.setEntity2(e);
+
+ Entity3 e32 = (Entity3) context.createAndRegisterNewObject(Entity3.class);
+ e32.setName("E32_" + i);
+ e32.setEntity2(e);
+ }
+
+ context.commitChanges();
+ }
+}
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/MixedCommitCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/MixedCommitCase.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/MixedCommitCase.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/MixedCommitCase.java Sun May 21 18:42:25 2006
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cayenne.profile.cases;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cayenne.profile.AbstractCase;
+import org.apache.cayenne.profile.entity.Entity2;
+import org.apache.cayenne.profile.entity.Entity3;
+import org.objectstyle.cayenne.DataObjectUtils;
+import org.objectstyle.cayenne.access.DataContext;
+
+public class MixedCommitCase extends AbstractCase {
+
+ protected void doRequest(
+ DataContext context,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ for (int i = 600; i < 850; i++) {
+ Entity2 o1 = (Entity2) DataObjectUtils.objectForPK(
+ context,
+ Entity2.class,
+ i * 2);
+ Entity2 o2 = (Entity2) DataObjectUtils.objectForPK(
+ context,
+ Entity2.class,
+ i * 2 + 1);
+
+ List e3s1 = o1.getEntity3s();
+ assertEquals(2, e3s1.size());
+
+ Entity3 e311 = (Entity3) e3s1.get(0);
+ Entity3 e312 = (Entity3) e3s1.get(1);
+
+ e311.setEntity2(o2);
+ e312.setEntity2(null);
+ context.deleteObject(e312);
+ }
+
+ context.commitChanges();
+ }
+}
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/ResolveToOneRelationshipCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/ResolveToOneRelationshipCase.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/ResolveToOneRelationshipCase.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/ResolveToOneRelationshipCase.java Sun May 21 18:42:25 2006
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cayenne.profile.cases;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cayenne.profile.AbstractCase;
+import org.apache.cayenne.profile.entity.Entity3;
+import org.objectstyle.cayenne.Fault;
+import org.objectstyle.cayenne.access.DataContext;
+import org.objectstyle.cayenne.exp.Expression;
+import org.objectstyle.cayenne.query.SelectQuery;
+
+public class ResolveToOneRelationshipCase extends AbstractCase {
+
+ protected void doRequest(
+ DataContext context,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ SelectQuery q = new SelectQuery(Entity3.class, Expression
+ .fromString("name like '%_111%'"));
+ List results = context.performQuery(q);
+ assertEquals(200, results.size());
+
+ Iterator it = results.iterator();
+ while (it.hasNext()) {
+ Entity3 e3 = (Entity3) it.next();
+ assertTrue(e3.readPropertyDirectly("entity2") instanceof Fault);
+ e3.getEntity2().getName();
+ assertFalse(e3.readPropertyDirectly("entity2") instanceof Fault);
+ }
+ }
+}
Copied: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/SetupCase.java (from r408500, incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/DeleteCase.java)
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/SetupCase.java?p2=incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/SetupCase.java&p1=incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/DeleteCase.java&r1=408500&r2=408548&rev=408548&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/DeleteCase.java (original)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/SetupCase.java Sun May 21 18:42:25 2006
@@ -19,20 +19,34 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.cayenne.profile.AbstractCase;
-import org.apache.cayenne.profile.entity.Entity1;
+import org.objectstyle.cayenne.CayenneRuntimeException;
import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.query.SQLTemplate;
+import org.objectstyle.cayenne.access.DataDomain;
+import org.objectstyle.cayenne.access.DataNode;
+import org.objectstyle.cayenne.access.DbGenerator;
-public class DeleteCase extends AbstractCase {
+public class SetupCase extends AbstractCase {
protected void doRequest(
DataContext context,
HttpServletRequest request,
HttpServletResponse response) {
- context.performNonSelectingQuery(new SQLTemplate(
- Entity1.class,
- "delete from ENTITY1",
- false));
+ DataDomain domain = context.getParentDataDomain();
+ DataNode node = domain.getNode("regression-profile");
+ DbGenerator generator = new DbGenerator(node.getAdapter(), domain
+ .getMap("regression-profile"));
+
+ generator.setShouldCreateFKConstraints(true);
+ generator.setShouldCreatePKSupport(true);
+ generator.setShouldCreateTables(true);
+ generator.setShouldDropPKSupport(true);
+ generator.setShouldDropTables(true);
+ try {
+ generator.runGenerator(node.getDataSource());
+ }
+ catch (Exception e) {
+ throw new CayenneRuntimeException("Error generating schema", e);
+ }
}
}
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/UpdateAttributeCase.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/UpdateAttributeCase.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/UpdateAttributeCase.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/cases/UpdateAttributeCase.java Sun May 21 18:42:25 2006
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cayenne.profile.cases;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cayenne.profile.AbstractCase;
+import org.apache.cayenne.profile.entity.Entity1;
+import org.objectstyle.cayenne.DataObjectUtils;
+import org.objectstyle.cayenne.access.DataContext;
+
+public class UpdateAttributeCase extends AbstractCase {
+
+ private static volatile int suffix = 1;
+
+ protected void doRequest(
+ DataContext context,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ for (int i = 600; i < 1100; i++) {
+ Entity1 o = (Entity1) DataObjectUtils.objectForPK(context, Entity1.class, i);
+
+ assertNotNull("No object for id: " + i, o);
+
+ o.setDescription("x_" + suffix++);
+ }
+
+ context.commitChanges();
+ }
+}
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity2.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity2.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity2.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity2.java Sun May 21 18:42:25 2006
@@ -0,0 +1,10 @@
+package org.apache.cayenne.profile.entity;
+
+import org.apache.cayenne.profile.entity.auto._Entity2;
+
+public class Entity2 extends _Entity2 {
+
+}
+
+
+
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity3.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity3.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity3.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/Entity3.java Sun May 21 18:42:25 2006
@@ -0,0 +1,10 @@
+package org.apache.cayenne.profile.entity;
+
+import org.apache.cayenne.profile.entity.auto._Entity3;
+
+public class Entity3 extends _Entity3 {
+
+}
+
+
+
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity2.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity2.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity2.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity2.java Sun May 21 18:42:25 2006
@@ -0,0 +1,36 @@
+package org.apache.cayenne.profile.entity.auto;
+
+import java.util.List;
+
+/** Class _Entity2 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public class _Entity2 extends org.objectstyle.cayenne.CayenneDataObject {
+
+ public static final String NAME_PROPERTY = "name";
+ public static final String ENTITY3S_PROPERTY = "entity3s";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setName(String name) {
+ writeProperty("name", name);
+ }
+ public String getName() {
+ return (String)readProperty("name");
+ }
+
+
+ public void addToEntity3s(org.apache.cayenne.profile.entity.Entity3 obj) {
+ addToManyTarget("entity3s", obj, true);
+ }
+ public void removeFromEntity3s(org.apache.cayenne.profile.entity.Entity3 obj) {
+ removeToManyTarget("entity3s", obj, true);
+ }
+ public List getEntity3s() {
+ return (List)readProperty("entity3s");
+ }
+
+
+}
Added: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity3.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity3.java?rev=408548&view=auto
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity3.java (added)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/entity/auto/_Entity3.java Sun May 21 18:42:25 2006
@@ -0,0 +1,32 @@
+package org.apache.cayenne.profile.entity.auto;
+
+/** Class _Entity3 was generated by Cayenne.
+ * It is probably a good idea to avoid changing this class manually,
+ * since it may be overwritten next time code is regenerated.
+ * If you need to make any customizations, please use subclass.
+ */
+public class _Entity3 extends org.objectstyle.cayenne.CayenneDataObject {
+
+ public static final String NAME_PROPERTY = "name";
+ public static final String ENTITY2_PROPERTY = "entity2";
+
+ public static final String ID_PK_COLUMN = "ID";
+
+ public void setName(String name) {
+ writeProperty("name", name);
+ }
+ public String getName() {
+ return (String)readProperty("name");
+ }
+
+
+ public void setEntity2(org.apache.cayenne.profile.entity.Entity2 entity2) {
+ setToOneTarget("entity2", entity2, true);
+ }
+
+ public org.apache.cayenne.profile.entity.Entity2 getEntity2() {
+ return (org.apache.cayenne.profile.entity.Entity2)readProperty("entity2");
+ }
+
+
+}
Modified: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/servlet/ProfileFilter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/servlet/ProfileFilter.java?rev=408548&r1=408547&r2=408548&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/servlet/ProfileFilter.java (original)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/java/org/apache/cayenne/profile/servlet/ProfileFilter.java Sun May 21 18:42:25 2006
@@ -23,7 +23,6 @@
import org.apache.commons.logging.LogFactory;
import org.objectstyle.cayenne.access.DataDomain;
import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.DbGenerator;
import org.objectstyle.cayenne.conf.Configuration;
import org.objectstyle.cayenne.dba.DbAdapter;
import org.objectstyle.cayenne.util.LocalizedStringsHandler;
@@ -70,17 +69,5 @@
+ "'; adapter: '"
+ adapterName
+ "'");
-
- // create fresh database
-
- DbGenerator generator = new DbGenerator(node.getAdapter(), domain
- .getMap("regression-profile"));
- try {
- generator.runGenerator(node.getDataSource());
- }
- catch (Exception e) {
- throw new ServletException("Error generating schema", e);
- }
-
}
}
Modified: incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/resources/regression-profile.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/resources/regression-profile.map.xml?rev=408548&r1=408547&r2=408548&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/resources/regression-profile.map.xml (original)
+++ incubator/cayenne/main/branches/STABLE-1-1/cayenne-regression-profiler-1.1/src/main/resources/regression-profile.map.xml Sun May 21 18:42:25 2006
@@ -6,8 +6,31 @@
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="NAME" type="VARCHAR" length="200"/>
</db-entity>
+ <db-entity name="ENTITY2">
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="NAME" type="VARCHAR" length="255"/>
+ </db-entity>
+ <db-entity name="ENTITY3">
+ <db-attribute name="ENTITY2_ID" type="INTEGER"/>
+ <db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+ <db-attribute name="NAME" type="VARCHAR" length="200"/>
+ </db-entity>
<obj-entity name="Entity1" className="org.apache.cayenne.profile.entity.Entity1" dbEntityName="ENTITY1">
<obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/>
<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
</obj-entity>
+ <obj-entity name="Entity2" className="org.apache.cayenne.profile.entity.Entity2" dbEntityName="ENTITY2">
+ <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
+ </obj-entity>
+ <obj-entity name="Entity3" className="org.apache.cayenne.profile.entity.Entity3" dbEntityName="ENTITY3">
+ <obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
+ </obj-entity>
+ <db-relationship name="entity3s" source="ENTITY2" target="ENTITY3" toMany="true">
+ <db-attribute-pair source="ID" target="ENTITY2_ID"/>
+ </db-relationship>
+ <db-relationship name="entity2" source="ENTITY3" target="ENTITY2" toMany="false">
+ <db-attribute-pair source="ENTITY2_ID" target="ID"/>
+ </db-relationship>
+ <obj-relationship name="entity3s" source="Entity2" target="Entity3" db-relationship-path="entity3s"/>
+ <obj-relationship name="entity2" source="Entity3" target="Entity2" db-relationship-path="entity2"/>
</data-map>