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 2008/11/30 15:26:59 UTC
svn commit: r721822 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cay...
Author: aadamchik
Date: Sun Nov 30 06:26:58 2008
New Revision: 721822
URL: http://svn.apache.org/viewvc?rev=721822&view=rev
Log:
CAY-1136 "Compiled" EntityResult ; Switch SelectQuery processing to use EntityResult
firther renaming: SQLResultSet -> SQLResult to avoid confusion with JDBC ResultSet
Added:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResult.java
- copied, changed from r721819, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResultSet.java
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResultSet.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLCompiledExpression.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
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/EntityResolver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MappingNamespace.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultResultSetMetadata.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMetadata.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataObjectUtilsTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java
cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLCompiledExpression.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLCompiledExpression.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLCompiledExpression.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/EJBQLCompiledExpression.java Sun Nov 30 06:26:58 2008
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.reflect.ClassDescriptor;
/**
@@ -62,5 +62,5 @@
* Returns a mapping of the result set columns, or null if this is not a select
* expression.
*/
- SQLResultSet getResultSet();
+ SQLResult getResult();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/CompiledExpression.java Sun Nov 30 06:26:58 2008
@@ -26,7 +26,7 @@
import org.apache.cayenne.ejbql.EJBQLExpression;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.reflect.ClassDescriptor;
/**
@@ -41,7 +41,7 @@
private Map<String, ClassDescriptor> descriptorsById;
private Map<String, ObjRelationship> incomingById;
private EJBQLExpression expression;
- private SQLResultSet resultSetMapping;
+ private SQLResult resultSetMapping;
public ClassDescriptor getEntityDescriptor(String idVariable) {
if (idVariable == null) {
@@ -51,7 +51,7 @@
return descriptorsById.get(Compiler.normalizeIdPath(idVariable));
}
- public SQLResultSet getResultSet() {
+ public SQLResult getResult() {
return resultSetMapping;
}
@@ -96,7 +96,7 @@
this.rootId = rootId;
}
- void setResultSetMapping(SQLResultSet resultSetMapping) {
+ void setResultSetMapping(SQLResult resultSetMapping) {
this.resultSetMapping = resultSetMapping;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/Compiler.java Sun Nov 30 06:26:58 2008
@@ -39,7 +39,7 @@
import org.apache.cayenne.map.EntityResult;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.reflect.ArcProperty;
import org.apache.cayenne.reflect.AttributeProperty;
import org.apache.cayenne.reflect.ClassDescriptor;
@@ -68,7 +68,7 @@
private EJBQLExpressionVisitor joinVisitor;
private EJBQLExpressionVisitor pathVisitor;
private EJBQLExpressionVisitor rootDescriptorVisitor;
- private List<Object> resultSetMappings;
+ private List<Object> resultComponents;
Compiler(EntityResolver resolver) {
this.resolver = resolver;
@@ -123,11 +123,11 @@
compiled.setDescriptorsById(descriptorsById);
compiled.setIncomingById(incomingById);
- if (resultSetMappings != null) {
- SQLResultSet mapping = new SQLResultSet();
+ if (resultComponents != null) {
+ SQLResult mapping = new SQLResult();
- for (int i = 0; i < resultSetMappings.size(); i++) {
- Object nextMapping = resultSetMappings.get(i);
+ for (int i = 0; i < resultComponents.size(); i++) {
+ Object nextMapping = resultComponents.get(i);
if (nextMapping instanceof String) {
mapping.addColumnResult((String) nextMapping);
}
@@ -443,23 +443,23 @@
private void addEntityResult(EJBQLExpression expression) {
if (appendingResultColumns) {
- if (resultSetMappings == null) {
- resultSetMappings = new ArrayList<Object>();
+ if (resultComponents == null) {
+ resultComponents = new ArrayList<Object>();
}
// defer EntityResult creation until we resolve all ids...
- resultSetMappings.add(expression);
+ resultComponents.add(expression);
}
}
private void addResultSetColumn() {
if (appendingResultColumns) {
- if (resultSetMappings == null) {
- resultSetMappings = new ArrayList<Object>();
+ if (resultComponents == null) {
+ resultComponents = new ArrayList<Object>();
}
- String column = "sc" + resultSetMappings.size();
- resultSetMappings.add(column);
+ String column = "sc" + resultComponents.size();
+ resultComponents.add(column);
}
}
}
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=721822&r1=721821&r2=721822&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 Sun Nov 30 06:26:58 2008
@@ -118,7 +118,7 @@
private SortedMap<String, DbEntity> dbEntityMap;
private SortedMap<String, Procedure> procedureMap;
private SortedMap<String, Query> queryMap;
- private SortedMap<String, SQLResultSet> resultSets;
+ private SortedMap<String, SQLResult> results;
private List<EntityListener> defaultEntityListeners;
@@ -143,7 +143,7 @@
procedureMap = new TreeMap<String, Procedure>();
queryMap = new TreeMap<String, Query>();
defaultEntityListeners = new ArrayList<EntityListener>(3);
- resultSets = new TreeMap<String, SQLResultSet>();
+ results = new TreeMap<String, SQLResult>();
setName(mapName);
initWithProperties(properties);
@@ -471,7 +471,7 @@
* @since 3.0
*/
public void clearResultSets() {
- resultSets.clear();
+ results.clear();
}
/**
@@ -554,28 +554,28 @@
*
* @since 3.0
*/
- public void addResultSet(SQLResultSet resultSet) {
- if (resultSet == null) {
- throw new NullPointerException("Null resultSet");
+ public void addResult(SQLResult result) {
+ if (result == null) {
+ throw new NullPointerException("Null result");
}
- if (resultSet.getName() == null) {
+ if (result.getName() == null) {
throw new NullPointerException(
"Attempt to add resultSetMapping with no name.");
}
- Object existing = resultSets.get(resultSet.getName());
+ Object existing = results.get(result.getName());
if (existing != null) {
- if (existing == resultSet) {
+ if (existing == result) {
return;
}
else {
throw new IllegalArgumentException(
- "An attempt to override resultSetMapping '" + resultSet.getName());
+ "An attempt to override resultSetMapping '" + result.getName());
}
}
- resultSets.put(resultSet.getName(), resultSet);
+ results.put(result.getName(), result);
}
/**
@@ -654,15 +654,15 @@
/**
* @since 3.0
*/
- public Map<String, SQLResultSet> getResultSetsMap() {
- return Collections.unmodifiableMap(resultSets);
+ public Map<String, SQLResult> getResultsMap() {
+ return Collections.unmodifiableMap(results);
}
/**
* @since 3.0
*/
- public Collection<SQLResultSet> getResultSets() {
- return Collections.unmodifiableCollection(resultSets.values());
+ public Collection<SQLResult> getResults() {
+ return Collections.unmodifiableCollection(results.values());
}
/**
@@ -680,13 +680,13 @@
/**
* @since 3.0
*/
- public SQLResultSet getResultSet(String name) {
- SQLResultSet rsMapping = resultSets.get(name);
+ public SQLResult getResult(String name) {
+ SQLResult rsMapping = results.get(name);
if (rsMapping != null) {
return rsMapping;
}
- return namespace != null ? namespace.getResultSet(name) : null;
+ return namespace != null ? namespace.getResult(name) : null;
}
/**
@@ -838,8 +838,8 @@
/**
* @since 3.0
*/
- public void removeResultSet(String name) {
- resultSets.remove(name);
+ public void removeResult(String name) {
+ results.remove(name);
}
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Sun Nov 30 06:26:58 2008
@@ -65,7 +65,7 @@
protected transient Map<String, Query> queryCache;
protected transient Map<String, Embeddable> embeddableCache;
- protected transient Map<String, SQLResultSet> resultSetCache;
+ protected transient Map<String, SQLResult> resultsCache;
protected transient Map<String, DbEntity> dbEntityCache;
protected transient Map<String, ObjEntity> objEntityCache;
protected transient Map<String, Procedure> procedureCache;
@@ -93,7 +93,7 @@
this.objEntityCache = new HashMap<String, ObjEntity>();
this.procedureCache = new HashMap<String, Procedure>();
this.entityInheritanceCache = new HashMap<String, EntityInheritanceTree>();
- this.resultSetCache = new HashMap<String, SQLResultSet>();
+ this.resultsCache = new HashMap<String, SQLResult>();
}
/**
@@ -389,10 +389,10 @@
/**
* @since 3.0
*/
- public Collection<SQLResultSet> getResultSets() {
+ public Collection<SQLResult> getResultSets() {
CompositeCollection c = new CompositeCollection();
for (DataMap map : getDataMaps()) {
- c.addComposited(map.getResultSets());
+ c.addComposited(map.getResults());
}
return c;
@@ -451,14 +451,14 @@
/**
* @since 3.0
*/
- public SQLResultSet getResultSet(String name) {
- SQLResultSet result = resultSetCache.get(name);
+ public SQLResult getResult(String name) {
+ SQLResult result = resultsCache.get(name);
if (result == null) {
// reconstruct cache just in case some of the datamaps
// have changed and now contain the required information
constructCache();
- result = resultSetCache.get(name);
+ result = resultsCache.get(name);
}
return result;
@@ -497,7 +497,7 @@
objEntityCache.clear();
procedureCache.clear();
entityInheritanceCache.clear();
- resultSetCache.clear();
+ resultsCache.clear();
embeddableCache.clear();
clientEntityResolver = null;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResult.java Sun Nov 30 06:26:58 2008
@@ -28,7 +28,7 @@
/**
* A metadata object that provides mapping of a set of result columns to an ObjEntity.
- * Used by {@link SQLResultSet}.
+ * Used by {@link SQLResult}.
*
* @since 3.0
*/
@@ -124,10 +124,6 @@
return entityClass;
}
- public Collection<FieldResult> getFields() {
- return fields != null ? fields : Collections.EMPTY_LIST;
- }
-
class FieldResult {
protected String entityName;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MappingNamespace.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MappingNamespace.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MappingNamespace.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MappingNamespace.java Sun Nov 30 06:26:58 2008
@@ -44,7 +44,7 @@
*
* @since 3.0
*/
- SQLResultSet getResultSet(String name);
+ SQLResult getResult(String name);
/**
* Returns DbEntity for a given name, or null if no such DbEntity is found in the
Copied: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResult.java (from r721819, cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResultSet.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResult.java?p2=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResult.java&p1=cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResultSet.java&r1=721819&r2=721822&rev=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResultSet.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/SQLResult.java Sun Nov 30 06:26:58 2008
@@ -24,12 +24,12 @@
/**
* A metadata object that defines how a row in a result set can be converted to result
- * objects. SQLResultSet can map to a single scalar, a single entity or a mix of scalars
- * and entities that is represented as an Object[].
+ * objects. SQLResult can be mapped to a single scalar, a single entity or a mix of
+ * scalars and entities that is represented as an Object[].
*
* @since 3.0
*/
-public class SQLResultSet {
+public class SQLResult {
protected String name;
protected List<Object> resultDescriptors;
@@ -37,14 +37,14 @@
/**
* Creates an unnamed SQLResultSet.
*/
- public SQLResultSet() {
+ public SQLResult() {
}
/**
* Creates a named SQLResultSet.
*/
- public SQLResultSet(String name) {
+ public SQLResult(String name) {
this.name = name;
}
@@ -60,7 +60,7 @@
* Returns a list of result descriptors. Column descriptors are returned as Strings,
* entity descriptors - as {@link EntityResult}.
*/
- public List<Object> getResultDescriptors() {
+ public List<Object> getComponents() {
return resultDescriptors != null ? resultDescriptors : Collections.EMPTY_LIST;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultResultSetMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultResultSetMetadata.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultResultSetMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultResultSetMetadata.java Sun Nov 30 06:26:58 2008
@@ -24,11 +24,11 @@
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.EntityResult;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.reflect.ClassDescriptor;
/**
- * A SQLResultSetMetadata implementation based on {@link SQLResultSet}.
+ * A SQLResultSetMetadata implementation based on {@link SQLResult}.
*
* @since 3.0
*/
@@ -38,8 +38,8 @@
private int[] scalarSegments;
private int[] entitySegments;
- DefaultResultSetMetadata(SQLResultSet resultSet, EntityResolver resolver) {
- List<Object> descriptors = resultSet.getResultDescriptors();
+ DefaultResultSetMetadata(SQLResult result, EntityResolver resolver) {
+ List<Object> descriptors = result.getComponents();
this.segments = new ArrayList<Object>(descriptors.size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/EJBQLQueryMetadata.java Sun Nov 30 06:26:58 2008
@@ -32,8 +32,8 @@
boolean resolve(EntityResolver resolver, EJBQLQuery query) {
EJBQLCompiledExpression expression = query.getExpression(resolver);
- resultSetMapping = expression.getResultSet() != null
- ? new DefaultResultSetMetadata(expression.getResultSet(), resolver)
+ resultSetMapping = expression.getResult() != null
+ ? new DefaultResultSetMetadata(expression.getResult(), resolver)
: null;
ObjEntity root = expression.getRootDescriptor().getEntity();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMetadata.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLResultSetMetadata.java Sun Nov 30 06:26:58 2008
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.cayenne.query;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
/**
- * A "compiled" version of a {@link SQLResultSet} descriptor.
+ * A "compiled" version of a {@link SQLResult} descriptor.
*
* @since 3.0
*/
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Sun Nov 30 06:26:58 2008
@@ -31,7 +31,7 @@
import org.apache.cayenne.map.MapLoader;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
import org.apache.commons.collections.IteratorUtils;
@@ -95,7 +95,7 @@
protected Map<String, String> templates;
protected Map<String, ?>[] parameters;
protected String columnNamesCapitalization;
- protected SQLResultSet resultSet;
+ protected SQLResult result;
SQLTemplateMetadata metaData = new SQLTemplateMetadata();
@@ -616,18 +616,18 @@
/**
* Sets an optional explicit mapping of the result set. If result set mapping is
* specified, the result of SQLTemplate may not be a normal list of Persistent objects
- * or DataRows, instead it will follow the {@link SQLResultSet} rules.
+ * or DataRows, instead it will follow the {@link SQLResult} rules.
*
* @since 3.0
*/
- public void setResultSet(SQLResultSet resultSet) {
- this.resultSet = resultSet;
+ public void setResult(SQLResult resultSet) {
+ this.result = resultSet;
}
/**
* @since 3.0
*/
- public SQLResultSet getResultSet() {
- return resultSet;
+ public SQLResult getResult() {
+ return result;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplateMetadata.java Sun Nov 30 06:26:58 2008
@@ -35,8 +35,8 @@
if (super.resolve(root, resolver, null)) {
- resultSetMapping = query.getResultSet() != null
- ? new DefaultResultSetMetadata(query.getResultSet(), resolver)
+ resultSetMapping = query.getResult() != null
+ ? new DefaultResultSetMetadata(query.getResult(), resolver)
: null;
// generate unique cache key...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataObjectUtilsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataObjectUtilsTest.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataObjectUtilsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/DataObjectUtilsTest.java Sun Nov 30 06:26:58 2008
@@ -31,7 +31,7 @@
import org.apache.cayenne.dba.frontbase.FrontBaseAdapter;
import org.apache.cayenne.dba.openbase.OpenBaseAdapter;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.query.EJBQLQuery;
import org.apache.cayenne.query.ObjectIdQuery;
import org.apache.cayenne.query.SQLTemplate;
@@ -60,9 +60,9 @@
query.setTemplate(OpenBaseAdapter.class.getName(), "SELECT COUNT(ARTIST_ID) AS X FROM ARTIST");
query.setColumnNamesCapitalization(SQLTemplate.UPPERCASE_COLUMN_NAMES);
- SQLResultSet rsMap = new SQLResultSet();
+ SQLResult rsMap = new SQLResult();
rsMap.addColumnResult("X");
- query.setResultSet(rsMap);
+ query.setResult(rsMap);
Object object = DataObjectUtils.objectForQuery(context, query);
assertNotNull(object);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSQLTemplateTest.java Sun Nov 30 06:26:58 2008
@@ -35,7 +35,7 @@
import org.apache.cayenne.dba.openbase.OpenBaseAdapter;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.EntityResult;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.unit.CayenneCase;
@@ -69,10 +69,10 @@
artistResult.addObjectField(Artist.ARTIST_NAME_PROPERTY, "Y");
artistResult.addObjectField(Artist.DATE_OF_BIRTH_PROPERTY, "Z");
- SQLResultSet rsMap = new SQLResultSet();
+ SQLResult rsMap = new SQLResult();
rsMap.addEntityResult(artistResult);
rsMap.addColumnResult("C");
- query.setResultSet(rsMap);
+ query.setResult(rsMap);
List objects = createDataContext().performQuery(query);
assertEquals(4, objects.size());
@@ -110,9 +110,9 @@
"SELECT COUNT(ARTIST_ID) X FROM ARTIST");
query.setColumnNamesCapitalization(SQLTemplate.UPPERCASE_COLUMN_NAMES);
- SQLResultSet rsMap = new SQLResultSet();
+ SQLResult rsMap = new SQLResult();
rsMap.addColumnResult("X");
- query.setResultSet(rsMap);
+ query.setResult(rsMap);
List objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
@@ -137,10 +137,10 @@
"SELECT COUNT(ARTIST_ID) X, 77 Y FROM ARTIST GROUP BY 77");
query.setColumnNamesCapitalization(SQLTemplate.UPPERCASE_COLUMN_NAMES);
- SQLResultSet rsMap = new SQLResultSet();
+ SQLResult rsMap = new SQLResult();
rsMap.addColumnResult("X");
rsMap.addColumnResult("Y");
- query.setResultSet(rsMap);
+ query.setResult(rsMap);
List objects = createDataContext().performQuery(query);
assertEquals(1, objects.size());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/map/MockMappingNamespace.java Sun Nov 30 06:26:58 2008
@@ -42,7 +42,7 @@
return null;
}
- public SQLResultSet getResultSet(String name) {
+ public SQLResult getResult(String name) {
return null;
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaNativeQuery.java Sun Nov 30 06:26:58 2008
@@ -55,7 +55,7 @@
query = new SQLTemplate(map, processSQLString(sqlString));
if(resultSetMappingName != null) {
- query.setResultSet(map.getResultSet(resultSetMappingName));
+ query.setResult(map.getResult(resultSetMappingName));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java?rev=721822&r1=721821&r2=721822&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java Sun Nov 30 06:26:58 2008
@@ -76,7 +76,7 @@
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.SQLResultSet;
+import org.apache.cayenne.map.SQLResult;
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.util.BaseTreeVisitor;
import org.apache.cayenne.util.HierarchicalTreeVisitor;
@@ -651,7 +651,7 @@
public boolean onStartNode(ProjectPath path) {
JpaSqlResultSetMapping jpaMapping = (JpaSqlResultSetMapping) path.getObject();
- SQLResultSet mapping = new SQLResultSet(jpaMapping.getName());
+ SQLResult mapping = new SQLResult(jpaMapping.getName());
for (JpaColumnResult c : jpaMapping.getColumnResults()) {
mapping.addColumnResult(c.getName());
@@ -670,7 +670,7 @@
// my understanding of JPA SQLResultSetMapping is that regardless of whether
// it belongs to entity or to the entire persistence unit, the scope is still
// persistence unit??
- targetPath.firstInstanceOf(DataMap.class).addResultSet(mapping);
+ targetPath.firstInstanceOf(DataMap.class).addResult(mapping);
return false;
}
}