You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ol...@apache.org on 2010/01/27 10:41:57 UTC
svn commit: r903580 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remo...
Author: oltka
Date: Wed Jan 27 09:41:55 2010
New Revision: 903580
URL: http://svn.apache.org/viewvc?rev=903580&view=rev
Log:
CAY-1374 Add parent dataMap property to Query interface
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/IndirectQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Query.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryChain.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RefreshQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQuery.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/DataMap.java Wed Jan 27 09:41:55 2010
@@ -268,6 +268,7 @@
for (Query q : getQueries()) {
NamedQuery proxy = new NamedQuery(q.getName());
proxy.setName(q.getName());
+ proxy.setDataMap(this);
// resolve metadata so that client can have access to it without knowing about
// the server query.
@@ -518,7 +519,7 @@
if (query.getName() == null) {
throw new NullPointerException("Query name can't be null.");
}
-
+
// TODO: change method signature to return replaced procedure and make sure the
// Modeler handles it...
Object existingQuery = queryMap.get(query.getName());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EjbqlBuilder.java Wed Jan 27 09:41:55 2010
@@ -27,7 +27,8 @@
@Override
Query getQuery() {
EJBQLQuery query = new EJBQLQuery(ejbql);
- query.setName(name);
+ query.setName(name);
+ query.setDataMap(dataMap);
query.initWithProperties(properties);
return query;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/ProcedureQueryBuilder.java Wed Jan 27 09:41:55 2010
@@ -42,6 +42,7 @@
}
query.setName(name);
+ query.setDataMap(dataMap);
query.setResultEntityName(resultEntity);
query.initWithProperties(properties);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLTemplateBuilder.java Wed Jan 27 09:41:55 2010
@@ -45,6 +45,7 @@
}
template.setName(name);
+ template.setDataMap(dataMap);
template.initWithProperties(properties);
// init SQL
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SelectQueryBuilder.java Wed Jan 27 09:41:55 2010
@@ -37,6 +37,7 @@
SelectQuery query = new SelectQuery();
query.setRoot(getRoot());
query.setName(name);
+ query.setDataMap(dataMap);
query.setQualifier(qualifier);
if (orderings != null && !orderings.isEmpty()) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/AbstractQuery.java Wed Jan 27 09:41:55 2010
@@ -40,7 +40,9 @@
*/
protected Object root;
protected String name;
+ protected DataMap dataMap;
+
/**
* @since 3.1
*/
@@ -49,6 +51,21 @@
}
/**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+
+ /**
+ * @since 3.1
+ */
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
+ /**
* Returns a symbolic name of the query.
*
* @since 1.1
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/BatchQuery.java Wed Jan 27 09:41:55 2010
@@ -25,6 +25,7 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
@@ -49,7 +50,13 @@
protected DbEntity dbEntity;
protected String name;
+
+ /**
+ * @since 3.1
+ */
+ protected DataMap dataMap;
+
public BatchQuery(DbEntity dbEntity) {
this.dbEntity = dbEntity;
this.batchIndex = -1;
@@ -66,6 +73,20 @@
public void setName(String name) {
this.name = name;
}
+
+ /**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ /**
+ * @since 3.1
+ */
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
/**
* Returns default select parameters.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQuery.java Wed Jan 27 09:41:55 2010
@@ -40,7 +40,9 @@
public class EJBQLQuery implements Query, XMLSerializable {
protected String name;
+ protected DataMap dataMap;
protected String ejbqlStatement;
+
protected Map<String, Object> namedParameters;
protected Map<Integer, Object> positionalParameters;
@@ -54,6 +56,21 @@
public EJBQLQuery() {
}
+ /**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+
+ /**
+ * @since 3.1
+ */
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
return visitor.visitQuery(this);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/IndirectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/IndirectQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/IndirectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/IndirectQuery.java Wed Jan 27 09:41:55 2010
@@ -21,6 +21,7 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
/**
@@ -32,9 +33,16 @@
public abstract class IndirectQuery implements Query {
protected String name;
+
+ /**
+ * @since 3.1
+ */
+ protected DataMap dataMap;
+
protected transient Query replacementQuery;
- protected transient EntityResolver lastResolver;
+
+ protected transient EntityResolver lastResolver;
/**
* @since 3.1
@@ -42,6 +50,21 @@
public <T> T acceptVisitor(ConfigurationNodeVisitor<T> visitor) {
return visitor.visitQuery(this);
}
+
+ /**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+
+ /**
+ * @since 3.1
+ */
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
/**
* Returns the metadata obtained from the replacement query.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Query.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Query.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Query.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/Query.java Wed Jan 27 09:41:55 2010
@@ -23,6 +23,7 @@
import org.apache.cayenne.access.QueryEngine;
import org.apache.cayenne.configuration.ConfigurationNode;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
/**
@@ -71,4 +72,9 @@
* @since 1.1
*/
String getName();
+
+ /**
+ * @since 3.1
+ */
+ DataMap getDataMap();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryChain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryChain.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryChain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryChain.java Wed Jan 27 09:41:55 2010
@@ -25,6 +25,7 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
/**
@@ -38,6 +39,12 @@
protected Collection<Query> chain;
protected String name;
+
+ /**
+ * @since 3.1
+ */
+ protected DataMap dataMap;
+
/**
* Creates an empty QueryChain.
@@ -123,6 +130,20 @@
}
/**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ /**
+ * @since 3.1
+ */
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
+ /**
* Returns default metadata.
*/
public QueryMetadata getMetaData(EntityResolver resolver) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RefreshQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RefreshQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RefreshQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/RefreshQuery.java Wed Jan 27 09:41:55 2010
@@ -24,6 +24,7 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
/**
@@ -160,6 +161,14 @@
Query substitutedQuery) {
query.route(router, resolver, this);
}
+
+ public DataMap getDataMap() {
+ return query.getDataMap();
+ }
};
}
+
+ public DataMap getDataMap() {
+ return null;
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java Wed Jan 27 09:41:55 2010
@@ -159,4 +159,11 @@
public String getName() {
return query.getName();
}
+
+ /**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ return query.getDataMap();
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RangeQuery.java Wed Jan 27 09:41:55 2010
@@ -168,4 +168,11 @@
public void route(QueryRouter router, EntityResolver resolver, Query substitutedQuery) {
throw new UnsupportedOperationException();
}
+
+ /**
+ * @since 3.1
+ */
+ public DataMap getDataMap() {
+ throw new UnsupportedOperationException();
+ }
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQuery.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/query/MockQuery.java Wed Jan 27 09:41:55 2010
@@ -20,11 +20,13 @@
package org.apache.cayenne.query;
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
+import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResolver;
public class MockQuery implements Query {
protected String name;
+ protected DataMap dataMap;
protected boolean selecting;
protected boolean routeCalled;
@@ -35,6 +37,16 @@
public MockQuery() {
}
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+
+ public void setDataMap(DataMap dataMap) {
+ this.dataMap = dataMap;
+ }
+
public MockQuery(String name) {
this.name = name;
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java Wed Jan 27 09:41:55 2010
@@ -309,6 +309,7 @@
}
query.setName(getFreeName(new QueryNameChecker(domain), query.getName()));
+ query.setDataMap(dataMap);
dataMap.addQuery(query);
QueryTypeController.fireQueryEvent(this, mediator, mediator
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java Wed Jan 27 09:41:55 2010
@@ -101,8 +101,10 @@
String queryName = NamedObjectFactory.createName(Query.class, dataMap);
if (query instanceof EJBQLQuery) {
((EJBQLQuery) query).setName(queryName);
+ ((EJBQLQuery) query).setDataMap(dataMap);
} else {
((AbstractQuery) query).setName(queryName);
+ ((AbstractQuery) query).setDataMap(dataMap);
}
dataMap.addQuery(query);
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java?rev=903580&r1=903579&r2=903580&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProjectUtil.java Wed Jan 27 09:41:55 2010
@@ -149,9 +149,11 @@
if (query instanceof AbstractQuery) {
((AbstractQuery) query).setName(newName);
+ ((AbstractQuery) query).setDataMap(map);
}
if (query instanceof EJBQLQuery) {
((EJBQLQuery) query).setName(newName);
+ ((EJBQLQuery) query).setDataMap(map);
}
map.removeQuery(oldName);
map.addQuery(query);