You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/04/18 11:14:56 UTC
cayenne git commit: Fix test failures on Oracle
Repository: cayenne
Updated Branches:
refs/heads/master dd833a6c6 -> 2e15d5226
Fix test failures on Oracle
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2e15d522
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2e15d522
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2e15d522
Branch: refs/heads/master
Commit: 2e15d522634fa978b19e4dabc0ef548f4dd82562
Parents: dd833a6
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 18 14:14:49 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 18 14:14:49 2018 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java | 3 +++
.../test/java/org/apache/cayenne/tx/TransactionIsolationIT.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2e15d522/cayenne-server/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
index 75d5526..37f30a9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/QueryWithInheritancePrefetchIT.java
@@ -99,6 +99,7 @@ public class QueryWithInheritancePrefetchIT extends ServerCase {
@Test
public void queryWithJointPrefetch() {
List<Dependent> result = ObjectSelect.query(Dependent.class)
+ .orderBy("db:" + Dependent.ID_PK_COLUMN)
.prefetch(Dependent.ROOT.joint())
.select(runtime.newContext());
@@ -108,6 +109,7 @@ public class QueryWithInheritancePrefetchIT extends ServerCase {
@Test
public void queryWithDisjointPrefetch() {
List<Dependent> result = ObjectSelect.query(Dependent.class)
+ .orderBy("db:" + Dependent.ID_PK_COLUMN)
.prefetch(Dependent.ROOT.disjoint())
.select(runtime.newContext());
@@ -117,6 +119,7 @@ public class QueryWithInheritancePrefetchIT extends ServerCase {
@Test
public void queryWithDisjointByIdPrefetch() {
List<Dependent> result = ObjectSelect.query(Dependent.class)
+ .orderBy("db:" + Dependent.ID_PK_COLUMN)
.prefetch(Dependent.ROOT.disjointById())
.select(runtime.newContext());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2e15d522/cayenne-server/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java b/cayenne-server/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
index 2671352..4983a6a 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/tx/TransactionIsolationIT.java
@@ -75,7 +75,7 @@ public class TransactionIsolationIT extends ServerCase {
}
TransactionDescriptor descriptor = new TransactionDescriptor(
- Connection.TRANSACTION_REPEATABLE_READ,
+ Connection.TRANSACTION_SERIALIZABLE,
TransactionPropagation.REQUIRES_NEW
);