Skip to content

Commit ed5f1d8

Browse files
committed
Fix Sybase ASE nightly failure of NationalizedTest
1 parent de34086 commit ed5f1d8

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/NationalizedTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import org.hibernate.annotations.Nationalized;
1111
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1212

13+
import org.hibernate.testing.orm.junit.DialectFeatureChecks;
14+
import org.hibernate.testing.orm.junit.RequiresDialectFeature;
1315
import org.junit.Test;
1416

1517
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@@ -18,6 +20,7 @@
1820
/**
1921
* @author Vlad Mihalcea
2022
*/
23+
@RequiresDialectFeature(feature = DialectFeatureChecks.SupportsUnicodeNClob.class)
2124
public class NationalizedTest extends BaseEntityManagerFunctionalTestCase {
2225

2326
@Override

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import org.hibernate.dialect.PostgreSQLDialect;
6767
import org.hibernate.dialect.SQLServerDialect;
6868
import org.hibernate.dialect.SpannerDialect;
69+
import org.hibernate.dialect.SybaseASEDialect;
6970
import org.hibernate.dialect.SybaseDialect;
7071
import org.hibernate.dialect.SybaseDriverKind;
7172
import org.hibernate.dialect.TiDBDialect;
@@ -1023,6 +1024,15 @@ public boolean apply(Dialect dialect) {
10231024
}
10241025
}
10251026

1027+
public static class SupportsUnicodeNClob implements DialectFeatureCheck {
1028+
@Override
1029+
public boolean apply(Dialect dialect) {
1030+
return !(dialect instanceof SybaseASEDialect aseDialect)
1031+
// The jconn driver apparently doesn't support unicode characters
1032+
|| aseDialect.getDriverKind() == SybaseDriverKind.JTDS;
1033+
}
1034+
}
1035+
10261036
private static final HashMap<Dialect, SqmFunctionRegistry> FUNCTION_REGISTRIES = new HashMap<>();
10271037

10281038
public static boolean definesFunction(Dialect dialect, String functionName) {

0 commit comments

Comments
 (0)