cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r725937 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/access/jdbc/ main/java/org/apache/cayenne/access/trans/ main/java/org/apache/cayenne/dba/oracle/ te...
Date Fri, 12 Dec 2008 07:49:04 GMT
Author: aadamchik
Date: Thu Dec 11 23:49:03 2008
New Revision: 725937

URL: http://svn.apache.org/viewvc?rev=725937&view=rev
Log:
renaming "label" property to "dataRowKey" in ColumnDescriptor for clarity

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ResultDirective.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
    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/dba/oracle/OracleProcedureAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/SelectTranslatorTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
Thu Dec 11 23:49:03 2008
@@ -98,7 +98,7 @@
 
         Map<String, Object> id = new TreeMap<String, Object>();
         for (int idIndex : idIndices) {
-            Object value = flatRow.get(columns[idIndex].getLabel());
+            Object value = flatRow.get(columns[idIndex].getDataRowKey());
             id.put(columns[idIndex].getName(), value);
         }
 
@@ -129,7 +129,7 @@
 
         // extract subset of flat row columns, recasting to the target keys
         for (ColumnDescriptor column : columns) {
-            row.put(column.getName(), flatRow.get(column.getLabel()));
+            row.put(column.getName(), flatRow.get(column.getDataRowKey()));
         }
 
         return row;
@@ -220,7 +220,7 @@
         if (column == null) {
             column = new ColumnDescriptor();
             column.setName(name);
-            column.setLabel(label);
+            column.setDataRowKey(label);
             map.put(name, column);
         }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
Thu Dec 11 23:49:03 2008
@@ -50,7 +50,7 @@
         this.types = new int[width];
 
         for (int i = 0; i < width; i++) {
-            labels[i] = columns[i].getLabel();
+            labels[i] = columns[i].getDataRowKey();
             types[i] = columns[i].getJdbcType();
         }
     }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
Thu Dec 11 23:49:03 2008
@@ -43,10 +43,10 @@
 
     // identifies column in result set
     protected String name;
-    protected String qualifiedColumnName;
+    protected String namePrefix;
 
     // identifies column in a DataRow
-    protected String label;
+    protected String dataRowKey;
 
     protected int jdbcType;
     protected String javaClass;
@@ -64,8 +64,7 @@
      */
     public ColumnDescriptor(String columnName, int jdbcType, String javaClass) {
         this.name = columnName;
-        this.qualifiedColumnName = columnName;
-        this.label = columnName;
+        this.dataRowKey = columnName;
         this.jdbcType = jdbcType;
         this.javaClass = javaClass;
     }
@@ -75,10 +74,10 @@
      * 
      * @since 1.2
      */
-    public ColumnDescriptor(DbAttribute attribute, String columnAlias) {
+    public ColumnDescriptor(DbAttribute attribute, String tableAlias) {
         this.name = attribute.getName();
-        this.qualifiedColumnName = attribute.getAliasedName(columnAlias);
-        this.label = name;
+        this.namePrefix = tableAlias;
+        this.dataRowKey = name;
         this.jdbcType = attribute.getType();
         this.javaClass = getDefaultJavaClass(attribute.getMaxLength(), attribute
                 .getScale());
@@ -94,7 +93,7 @@
     public ColumnDescriptor(ObjAttribute objAttribute, DbAttribute dbAttribute,
             String columnAlias) {
         this(dbAttribute, columnAlias);
-        this.label = objAttribute.getDbAttributePath();
+        this.dataRowKey = objAttribute.getDbAttributePath();
         this.javaClass = objAttribute.getType();
     }
 
@@ -105,8 +104,7 @@
      */
     public ColumnDescriptor(ProcedureParameter parameter) {
         this.name = parameter.getName();
-        this.qualifiedColumnName = name;
-        this.label = name;
+        this.dataRowKey = name;
         this.jdbcType = parameter.getType();
         this.javaClass = getDefaultJavaClass(parameter.getMaxLength(), parameter
                 .getPrecision());
@@ -132,8 +130,7 @@
         }
 
         this.name = name;
-        this.qualifiedColumnName = name;
-        this.label = name;
+        this.dataRowKey = name;
         this.jdbcType = metaData.getColumnType(position);
         this.javaClass = metaData.getColumnClassName(position);
     }
@@ -152,10 +149,10 @@
 
         ColumnDescriptor rhs = (ColumnDescriptor) o;
         return new EqualsBuilder().append(name, rhs.name).append(
-                qualifiedColumnName,
-                rhs.qualifiedColumnName).append(procedureName, rhs.procedureName).append(
-                label,
-                rhs.label).append(tableName, rhs.tableName).isEquals();
+                namePrefix,
+                rhs.namePrefix).append(procedureName, rhs.procedureName).append(
+                dataRowKey,
+                rhs.dataRowKey).append(tableName, rhs.tableName).isEquals();
     }
 
     /**
@@ -163,13 +160,8 @@
      */
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(23, 43)
-                .append(name)
-                .append(qualifiedColumnName)
-                .append(procedureName)
-                .append(tableName)
-                .append(label)
-                .toHashCode();
+        return new HashCodeBuilder(23, 43).append(name).append(namePrefix).append(
+                procedureName).append(tableName).append(dataRowKey).toHashCode();
     }
 
     /**
@@ -178,9 +170,9 @@
     @Override
     public String toString() {
         ToStringBuilder builder = new ToStringBuilder(this);
-        builder.append("namePrefix", getQualifiedColumnName());
+        builder.append("namePrefix", namePrefix);
         builder.append("name", getName());
-        builder.append("label", getLabel());
+        builder.append("dataRowKey", getDataRowKey());
         builder.append("tableName", getTableName());
         builder.append("procedureName", getProcedureName());
         builder.append("javaClass", getJavaClass());
@@ -203,7 +195,7 @@
      * @since 1.2
      */
     public String getQualifiedColumnName() {
-        return qualifiedColumnName != null ? qualifiedColumnName : name;
+        return (namePrefix != null) ? namePrefix + '.' + name : name;
     }
 
     public int getJdbcType() {
@@ -266,25 +258,34 @@
     }
 
     /**
+     * Returns "label" used in a DataRow for column value.
+     * 
      * @since 1.2
+     * @deprecated since 3.0 use {@link #getDataRowKey()}
      */
-    public void setQualifiedColumnName(String namePrefix) {
-        this.qualifiedColumnName = namePrefix;
+    public String getLabel() {
+        return getDataRowKey();
     }
 
     /**
-     * Returns "label" used in a DataRow for column value.
-     * 
      * @since 1.2
+     * @deprecated since 3.0 use {@link #setDataRowKey(String)}.
      */
-    public String getLabel() {
-        return (label != null) ? label : getName();
+    public void setLabel(String label) {
+        setDataRowKey(label);
     }
 
     /**
-     * @since 1.2
+     * @since 3.0
+     */
+    public String getDataRowKey() {
+        return dataRowKey != null ? dataRowKey : getName();
+    }
+
+    /**
+     * @since 3.0
      */
-    public void setLabel(String columnName) {
-        this.label = columnName;
+    public void setDataRowKey(String dataRowKey) {
+        this.dataRowKey = dataRowKey;
     }
 }

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
Thu Dec 11 23:49:03 2008
@@ -75,7 +75,7 @@
                         // note that JDBC index is "1" based
                         index = i + 1;
                         jdbcType = columns[i].getJdbcType();
-                        key = columns[i].getLabel();
+                        key = columns[i].getDataRowKey();
                     }
 
                     break;

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
Thu Dec 11 23:49:03 2008
@@ -67,7 +67,7 @@
             // query translator may change the order of fields compare to the entity
             // result, so figure out DataRow labels by doing reverse lookup of
             // RowDescriptor labels...
-            labels[i] = segmentMetadata.getColumnPath(columns[startIndex + i].getLabel());
+            labels[i] = segmentMetadata.getColumnPath(columns[startIndex + i].getDataRowKey());
         }
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ProcedureAction.java
Thu Dec 11 23:49:03 2008
@@ -210,7 +210,7 @@
             Object val = type.materializeObject(statement, i + 1, descriptor
                     .getJdbcType());
 
-            result.put(descriptor.getLabel(), val);
+            result.put(descriptor.getDataRowKey(), val);
         }
 
         if (result != null && !result.isEmpty()) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ResultDirective.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ResultDirective.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ResultDirective.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/ResultDirective.java
Thu Dec 11 23:49:03 2008
@@ -130,7 +130,7 @@
 
         ColumnDescriptor columnDescriptor = new ColumnDescriptor();
         columnDescriptor.setName(column);
-        columnDescriptor.setLabel(label);
+        columnDescriptor.setDataRowKey(label);
 
         String type = getChildAsString(context, node, 1);
         if (type != null) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
Thu Dec 11 23:49:03 2008
@@ -93,11 +93,11 @@
         if (caseTransformer != null) {
             for (int i = 0; i < len; i++) {
 
-                String oldLabel = columns[i].getLabel();
+                String oldLabel = columns[i].getDataRowKey();
                 String oldName = columns[i].getName();
 
                 String newLabel = (String) caseTransformer.transform(oldLabel);
-                columns[i].setLabel(newLabel);
+                columns[i].setDataRowKey(newLabel);
 
                 // do we even need to check this?
                 if (oldName.equals(oldLabel)) {

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=725937&r1=725936&r2=725937&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 11 23:49:03 2008
@@ -533,7 +533,7 @@
                     alias) : new ColumnDescriptor(attribute, alias);
 
             if (label != null) {
-                column.setLabel(label);
+                column.setDataRowKey(label);
             }
 
             columns.add(column);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OracleProcedureAction.java
Thu Dec 11 23:49:03 2008
@@ -98,7 +98,7 @@
                 Object val = type.materializeObject(statement, i + 1, descriptor
                         .getJdbcType());
 
-                result.put(descriptor.getLabel(), val);
+                result.put(descriptor.getDataRowKey(), val);
             }
         }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/ColumnDescriptorTest.java
Thu Dec 11 23:49:03 2008
@@ -38,8 +38,8 @@
 
     public void testLabel() {
         ColumnDescriptor column = new ColumnDescriptor();
-        column.setLabel("abc");
-        assertEquals("abc", column.getLabel());
+        column.setDataRowKey("abc");
+        assertEquals("abc", column.getDataRowKey());
     }
 
     public void testDbAttributeConstructor() {
@@ -56,27 +56,27 @@
         assertEquals("name", column.getQualifiedColumnName());
         assertEquals("entity", column.getTableName());
         assertEquals(String.class.getName(), column.getJavaClass());
-        assertEquals("name", column.getLabel());
+        assertEquals("name", column.getDataRowKey());
         assertEquals(Types.VARCHAR, column.getJdbcType());
     }
 
     public void testEquals() {
         ColumnDescriptor column1 = new ColumnDescriptor();
         column1.setName("n1");
-        column1.setQualifiedColumnName("np1");
+        column1.namePrefix = "np1";
         column1.setTableName("t1");
         // type should be ignored in the comparison
         column1.setJdbcType(Types.VARCHAR);
 
         ColumnDescriptor column2 = new ColumnDescriptor();
         column2.setName("n1");
-        column2.setQualifiedColumnName("np1");
+        column2.namePrefix = "np1";
         column2.setTableName("t1");
         column2.setJdbcType(Types.BOOLEAN);
 
         ColumnDescriptor column3 = new ColumnDescriptor();
         column3.setName("n1");
-        column3.setQualifiedColumnName("np3");
+        column3.namePrefix = "np3";
         column3.setTableName("t1");
 
         assertEquals(column1, column2);
@@ -87,20 +87,20 @@
     public void testHashCode() {
         ColumnDescriptor column1 = new ColumnDescriptor();
         column1.setName("n1");
-        column1.setQualifiedColumnName("np1");
+        column1.namePrefix = "np1";
         column1.setTableName("t1");
         // type should be ignored in the comparison
         column1.setJdbcType(Types.VARCHAR);
 
         ColumnDescriptor column2 = new ColumnDescriptor();
         column2.setName("n1");
-        column2.setQualifiedColumnName("np1");
+        column2.namePrefix = "np1";
         column2.setTableName("t1");
         column2.setJdbcType(Types.BOOLEAN);
 
         ColumnDescriptor column3 = new ColumnDescriptor();
         column3.setName("n1");
-        column3.setQualifiedColumnName("np3");
+        column3.namePrefix = "np3";
         column3.setTableName("t1");
 
         assertEquals(column1.hashCode(), column2.hashCode());

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessorSelectTest.java
Thu Dec 11 23:49:03 2008
@@ -81,7 +81,7 @@
         assertEquals(1, compiled.getResultColumns().length);
         ColumnDescriptor column = compiled.getResultColumns()[0];
         assertEquals("A", column.getName());
-        assertEquals("B", column.getLabel());
+        assertEquals("B", column.getDataRowKey());
         assertEquals("java.lang.String", column.getJavaClass());
     }
 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/SelectTranslatorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/SelectTranslatorTest.java?rev=725937&r1=725936&r2=725937&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/SelectTranslatorTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/SelectTranslatorTest.java
Thu Dec 11 23:49:03 2008
@@ -468,7 +468,7 @@
             }
 
             ColumnDescriptor c = new ColumnDescriptor(a, "t1");
-            c.setLabel("toArtist." + a.getName());
+            c.setDataRowKey("toArtist." + a.getName());
             assertTrue("No descriptor for " + a + ", columns: " + columns, columns
                     .contains(c));
         }



Mime
View raw message