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 2009/11/26 10:17:04 UTC
svn commit: r884471 - in /cayenne/main/branches/STABLE-3.0:
docs/doc/src/main/resources/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/
Author: aadamchik
Date: Thu Nov 26 09:17:00 2009
New Revision: 884471
URL: http://svn.apache.org/viewvc?rev=884471&view=rev
Log:
CAY-1247 Query SQL syntax with join and OR on Oracle8 (and maybe OpenBase)
Added:
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8QualifierTranslator.java
- copied, changed from r884189, cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
Modified:
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=884471&r1=884470&r2=884471&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt Thu Nov 26 09:17:00 2009
@@ -14,6 +14,7 @@
Bug Fixes Since beta1:
+CAY-1247 Query SQL syntax with join and OR on Oracle8 (and maybe OpenBase)
CAY-1305 EJBQL doesn't support null parameters
CAY-1307 Error committing CLOB on Oracle8
CAY-1309 many validation errors when we remove dbEntity
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java?rev=884471&r1=884470&r2=884471&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java Thu Nov 26 09:17:00 2009
@@ -22,6 +22,8 @@
import java.net.URL;
import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.trans.QualifierTranslator;
+import org.apache.cayenne.access.trans.QueryAssembler;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.SQLAction;
@@ -50,4 +52,9 @@
return super.findResource(name);
}
+
+ @Override
+ public QualifierTranslator getQualifierTranslator(QueryAssembler queryAssembler) {
+ return new Oracle8QualifierTranslator(queryAssembler);
+ }
}
Copied: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8QualifierTranslator.java (from r884189, cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java)
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8QualifierTranslator.java?p2=cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8QualifierTranslator.java&p1=cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java&r1=884189&r2=884471&rev=884471&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8Adapter.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/Oracle8QualifierTranslator.java Thu Nov 26 09:17:00 2009
@@ -16,38 +16,36 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
package org.apache.cayenne.dba.oracle;
-import java.net.URL;
+import java.io.IOException;
-import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SQLAction;
+import org.apache.cayenne.access.trans.QueryAssembler;
/**
- * A flavor of OracleAdapter that implements workarounds for some old driver limitations.
+ * Extends the TrimmingQualifierTranslator that Cayenne normally uses for Oracle.
+ * Overrides doAppendPart() to wrap the qualifierBuffer in parentheses if it contains an
+ * "OR" expression. This avoids a bug that can happen on Oracle8 if the query also
+ * contains a join.
*
- * @since 1.2
+ * @since 3.0
*/
-public class Oracle8Adapter extends OracleAdapter {
+class Oracle8QualifierTranslator extends OracleQualifierTranslator {
- /**
- * Uses OracleActionBuilder to create the right action.
- */
- @Override
- public SQLAction getAction(Query query, DataNode node) {
- return query.createSQLAction(new Oracle8ActionBuilder(this, node
- .getEntityResolver()));
+ public Oracle8QualifierTranslator(QueryAssembler queryAssembler) {
+ super(queryAssembler);
}
@Override
- protected URL findResource(String name) {
+ protected void doAppendPart() throws IOException {
+ super.doAppendPart();
- if ("/types.xml".equals(name)) {
- name = "/types-oracle8.xml";
+ if (out instanceof StringBuilder) {
+ StringBuilder buffer = (StringBuilder) out;
+ if (buffer.indexOf(" OR ") != -1) {
+ buffer.insert(0, '(');
+ buffer.append(')');
+ }
}
-
- return super.findResource(name);
}
}