[Cayenne-cvs] cayenne/src/cayenne/java/org/objectstyle/cayenne/dba/oracle OracleQualifierTranslator.java,1.1,1.2

[<me...@us...>]

Update of /cvsroot/cayenne/cayenne/src/cayenne/java/org/objectstyle/cayenne/dba/oracle
In directory usw-pr-cvs1:/tmp/cvs-serv5239/src/cayenne/java/org/objectstyle/cayenne/dba/oracle

Modified Files:
	OracleQualifierTranslator.java 
Log Message:
fixed oracle adapter broken as a result of recent
translator changes.

Unit testing rules !!!


Index: OracleQualifierTranslator.java
===================================================================
RCS file: /cvsroot/cayenne/cayenne/src/cayenne/java/org/objectstyle/cayenne/dba/oracle/OracleQualifierTranslator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OracleQualifierTranslator.java	8 Sep 2002 22:46:47 -0000	1.1
+++ OracleQualifierTranslator.java	1 Oct 2002 06:07:31 -0000	1.2
@@ -61,6 +61,7 @@
 import org.objectstyle.cayenne.access.trans.QualifierTranslator;
 import org.objectstyle.cayenne.map.DbAttribute;
 import org.objectstyle.cayenne.map.DbEntity;
+import org.objectstyle.cayenne.map.DbRelationship;
 
 /** 
  * Sequence-based primary key generator implementation for Oracle. 
@@ -82,14 +83,34 @@
  */
 public class OracleQualifierTranslator extends QualifierTranslator {
 
+    /**
+     * Adds special handling of CHAR columns.
+     */
     protected void processColumn(StringBuffer buf, DbAttribute dbAttr) {
         if (dbAttr.getType() == Types.CHAR) {
             buf.append("TRIM(TRAILING FROM ");
             super.processColumn(buf, dbAttr);
             buf.append(')');
-        }
-        else {
+        } else {
             super.processColumn(buf, dbAttr);
+        }
+    }
+
+    /**
+     * Adds special handling of CHAR columns.
+     * 
+     * @see org.objectstyle.cayenne.access.trans.QueryAssemblerHelper#processColumn(StringBuffer, DbAttribute, DbRelationship)
+     */
+    protected void processColumn(
+        StringBuffer buf,
+        DbAttribute dbAttr,
+        DbRelationship rel) {
+        if (dbAttr.getType() == Types.CHAR) {
+            buf.append("TRIM(TRAILING FROM ");
+            super.processColumn(buf, dbAttr, rel);
+            buf.append(')');
+        } else {
+            super.processColumn(buf, dbAttr, rel);
         }
     }
 }