Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-903 - Commit contribution submitted by Tim McConnell. [Ref: http://archives.postgresql.org/pgsql-jdbc/2008-01/msg00089.php] 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@749423 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Albert Lee 2009-03-02 19:32:14 +00:00
parent a95c0f0f89
commit 781c837812
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
View File

@ -144,6 +144,7 @@ public class PostgresDictionary
})); }));
supportsLockingWithDistinctClause = false; supportsLockingWithDistinctClause = false;
supportsQueryTimeout = false;
supportsLockingWithOuterJoin = false; supportsLockingWithOuterJoin = false;
supportsNullTableForGetImportedKeys = true; supportsNullTableForGetImportedKeys = true;

25
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/exception/TestException.java
View File

@ -29,6 +29,7 @@ import javax.persistence.OptimisticLockException;
import javax.persistence.Query; import javax.persistence.Query;
import javax.persistence.TransactionRequiredException; import javax.persistence.TransactionRequiredException;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.sql.DBDictionary; import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.SQLErrorCodeReader; import org.apache.openjpa.jdbc.sql.SQLErrorCodeReader;
import org.apache.openjpa.persistence.test.SingleEMFTestCase; import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@ -54,6 +55,10 @@ public class TestException extends SingleEMFTestCase {
* exception thrown is an instance of javax.persistence.OptimisticException. * exception thrown is an instance of javax.persistence.OptimisticException.
*/ */
public void testThrowsOptimisticException() { public void testThrowsOptimisticException() {
boolean supportsQueryTimeout = ((JDBCConfiguration) emf
.getConfiguration()).getDBDictionaryInstance().supportsQueryTimeout;
EntityManager em1 = emf.createEntityManager(); EntityManager em1 = emf.createEntityManager();
EntityManager em2 = emf.createEntityManager(); EntityManager em2 = emf.createEntityManager();
assertNotEquals(em1, em2); assertNotEquals(em1, em2);
@ -75,14 +80,18 @@ public class TestException extends SingleEMFTestCase {
assertTrue(pc1 != pc2); assertTrue(pc1 != pc2);
pc1.setName("Modified in TXN1"); pc1.setName("Modified in TXN1");
em1.flush(); if (supportsQueryTimeout) {
try { em1.flush();
pc2.setName("Modified in TXN2"); try {
em2.flush(); pc2.setName("Modified in TXN2");
fail("Expected " + OptimisticLockException.class); em2.flush();
} catch (Throwable t) { fail("Expected " + OptimisticLockException.class);
assertException(t, OptimisticLockException.class); } catch (Throwable t) {
} assertException(t, OptimisticLockException.class);
}
} else {
pc2.setName("Modified in TXN2");
}
em1.getTransaction().commit(); em1.getTransaction().commit();
try { try {