svn commit: r729421 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/

[aa...@apache.org]

Author: aadamchik
Date: Thu Dec 25 05:29:51 2008
New Revision: 729421

URL: http://svn.apache.org/viewvc?rev=729421&view=rev
Log:
CAY-1161 Deprecate SelectQuery custom columns feature

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=729421&r1=729420&r2=729421&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Thu Dec 25 05:29:51 2008
@@ -21,6 +21,7 @@
 CAY-1153 MySQL : Enable views during reverse engineering
 CAY-1154 Rename .access.reveng package to .map.naming
 CAY-1156 Modeler search improvement
+CAY-1161 Deprecate SelectQuery custom columns feature
 
 BugFixes Since M5:
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt?rev=729421&r1=729420&r2=729421&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/UPGRADE.txt Thu Dec 25 05:29:51 2008
@@ -6,6 +6,9 @@
 * Per CAY-1154, org.apache.cayenne.access.reveng package was renamed to org.apache.cayenne.map.naming. So, if you
   use your own naming strategies, you should update as well.
 
+* Per CAY-1161, custom columns feature in SelectQuery was deprecated. Consider switching to EJBQL as an alternative.
+  Custom columns support will likely go away completely after 3.0M6.
+
 UPGRADING FROM 3.0M4
 
 * Per CAY-1127, query "name" property is no longer used as an internal cache key. This change should be transparent

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java?rev=729421&r1=729420&r2=729421&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java Thu Dec 25 05:29:51 2008
@@ -519,6 +519,9 @@
 
     /**
      * Appends custom columns from SelectQuery to the provided list.
+     * 
+     * @deprecated since 3.0. Will likely be removed after 3.0M6. Can be replaced with
+     *             EJBQL.
      */
     List<ColumnDescriptor> appendCustomColumns(
             List<ColumnDescriptor> columns,

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java?rev=729421&r1=729420&r2=729421&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SelectQuery.java Thu Dec 25 05:29:51 2008
@@ -411,6 +411,9 @@
 
     /**
      * Returns a list of attributes that will be included in the results of this query.
+     * 
+     * @deprecated since 3.0. Will likely be removed after 3.0M6. Can be replaced with
+     *             EJBQL.
      */
     public List<String> getCustomDbAttributes() {
         // if query root is DbEntity, and no custom attributes
@@ -431,11 +434,18 @@
      * Adds a path to the DbAttribute that should be included in the results of this
      * query. Valid paths would look like <code>ARTIST_NAME</code>,
      * <code>PAINTING_ARRAY.PAINTING_ID</code>, etc.
+     * 
+     * @deprecated since 3.0. Will likely be removed after 3.0M6. Can be replaced with
+     *             EJBQL.
      */
     public void addCustomDbAttribute(String attributePath) {
         nonNullCustomDbAttributes().add(attributePath);
     }
 
+    /**
+     * @deprecated since 3.0. Will likely be removed after 3.0M6. Can be replaced with
+     *             EJBQL.
+     */
     public void addCustomDbAttributes(List<String> attrPaths) {
         nonNullCustomDbAttributes().addAll(attrPaths);
     }