diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 5f6b57054..f2491909a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.*; public class TestQueryForUpdate extends BaseTestCase { - @IgnorePlatform({Platform.DB2}) @Test public void testForUpdate() { @@ -36,12 +35,11 @@ public class TestQueryForUpdate extends BaseTestCase { if (isSqlServer()) { assertThat(sqlOf(query)).contains("with (updlock)"); - } else { + } else if (!isDb2()){ assertThat(sqlOf(query)).contains("for update"); } } - @IgnorePlatform({Platform.DB2}) @Test public void testForUpdate_withLimit() { ResetBasicData.reset(); @@ -58,7 +56,8 @@ public class TestQueryForUpdate extends BaseTestCase { if (isSqlServer()) { assertThat(sqlOf(query)).contains("with (updlock)"); - } else { + } else if (!isOracle() && !isDb2()) { + // Oracle does not support FOR UPDATE with FETCH assertThat(sqlOf(query)).contains("for update"); } } diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 57f4c15ff..629776577 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -267,7 +267,6 @@ public class TestQueryFindPagedList extends BaseTestCase { assertThat(trimSql(loggedSql.get(1), 3)).contains(" b.id, b.status, b.order_date"); } - // @IgnorePlatform(Platform.ORACLE) @Test void test_forUpdate() { ResetBasicData.reset();