Author: hthomann
Date: Tue Aug 27 15:02:10 2013
New Revision: 1517841
URL: http://svn.apache.org/r1517841
Log:
OPENJPA-2423: Isolation level is not working properly on DB2 for JPQL queries
with nested sub-queries - committed to 2.2.x the patch/fix provided by Pinaki
Poddar.
Modified:
openjpa/branches/2.2.x/ (props changed)
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/
(props changed)
Propchange: openjpa/branches/2.2.x/
------------------------------------------------------------------------------
Merged /openjpa/branches/2.1.x:r1517838
Modified:
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1517841&r1=1517840&r2=1517841&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
(original)
+++
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Tue Aug 27 15:02:10 2013
@@ -437,7 +437,8 @@ public class DB2Dictionary
break;
}
} else {
- if ( fetch != null && fetch.getIsolation() ==
Connection.TRANSACTION_READ_UNCOMMITTED ) {
+ if ( fetch != null && fetch.getIsolation() ==
Connection.TRANSACTION_READ_UNCOMMITTED
+ && sel.getParent() == null) { // i.e. not a
subquery
forUpdateString.append(" ").append(forReadOnlyClause)
.append(" ").append(withURClause);
}
Propchange:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/
------------------------------------------------------------------------------
Merged
/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany:r1517838
