From c802501a0abf5f359637ea68874a51f97e8e1d50 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sat, 30 Nov 2024 10:40:43 +0100 Subject: [PATCH] try to fix two CI failures from new tests --- .../orm/test/customsql/CustomSqlRestrictionOverridesTest.java | 2 +- .../hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java index 2a898baa96..18d16f0119 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/customsql/CustomSqlRestrictionOverridesTest.java @@ -34,7 +34,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @RequiresDialect(MySQLDialect.class) @RequiresDialect(SQLServerDialect.class) @RequiresDialect(PostgreSQLDialect.class) -@RequiresDialect(DB2Dialect.class) +@RequiresDialect(value = DB2Dialect.class, majorVersion = 11) @RequiresDialect(OracleDialect.class) public class CustomSqlRestrictionOverridesTest { @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java index 855055d7cb..fb6a21e8c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/ReSaveReferencedDeletedEntity.java @@ -6,14 +6,18 @@ package org.hibernate.orm.test.id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; +import org.hibernate.dialect.HANADialect; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.Test; import jakarta.persistence.*; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; +@SkipForDialect( dialectClass = HANADialect.class, + reason = "The INSERT statement for table [Child] contains no column, and this is not supported") public class ReSaveReferencedDeletedEntity extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() {