Skip to content

Commit f56ebab

Browse files
committed
HHH-19365 GaussDB Dialect Support-fix some skipped tests
1 parent 6ccc673 commit f56ebab

File tree

9 files changed

+7
-19
lines changed

9 files changed

+7
-19
lines changed

hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
2020
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
21-
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB query serialization level of SERIALIZABLE has some problem")
21+
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB does not support SERIALIZABLE isolation")
2222
public class AgroalTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2323
@Override
2424
protected ConnectionProvider getConnectionProviderUnderTest() {

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
2525
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
2626
@SkipForDialect(value = SybaseASEDialect.class, comment = "JtdsConnection.isValid not implemented")
27-
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB query serialization level of SERIALIZABLE has some problem")
27+
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB does not support SERIALIZABLE isolation")
2828
public class C3p0TransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2929
private StandardServiceRegistry ssr;
3030

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777
import org.hibernate.tool.schema.spi.Exporter;
7878
import org.hibernate.type.JavaObjectType;
7979
import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
80+
import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
81+
import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
8082
import org.hibernate.type.descriptor.jdbc.JdbcType;
8183
import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;
8284
import org.hibernate.type.descriptor.jdbc.SqlTypedJdbcType;
@@ -1216,7 +1218,8 @@ protected void contributeGaussDBTypes(TypeContributions typeContributions, Servi
12161218
.getJdbcTypeRegistry();
12171219
// For how BLOB affects Hibernate, see:
12181220
// http://in.relation.to/15492.lace
1219-
1221+
jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.BLOB_BINDING );
1222+
jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.CLOB_BINDING );
12201223
jdbcTypeRegistry.addDescriptor( XmlJdbcType.INSTANCE );
12211224

12221225
jdbcTypeRegistry.addDescriptorIfAbsent( GaussDBCastingInetJdbcType.INSTANCE );

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyBasicFieldMergeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import org.hibernate.testing.orm.junit.JiraKey;
2121
import org.hibernate.testing.orm.junit.SessionFactory;
2222
import org.hibernate.testing.orm.junit.SessionFactoryScope;
23-
import org.hibernate.testing.orm.junit.SkipForDialect;
24-
import org.hibernate.community.dialect.GaussDBDialect;
2523

2624
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2725
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -43,7 +41,6 @@
4341
public class LazyBasicFieldMergeTest {
4442

4543
@Test
46-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB does not support byte array operations through lob type")
4744
public void test(SessionFactoryScope scope) {
4845
scope.inTransaction( session -> {
4946
Manager manager = new Manager();

hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyInitializationWithoutInlineDirtyTrackingTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import org.hibernate.testing.orm.junit.JiraKey;
2222
import org.hibernate.testing.orm.junit.SessionFactory;
2323
import org.hibernate.testing.orm.junit.SessionFactoryScope;
24-
import org.hibernate.testing.orm.junit.SkipForDialect;
25-
import org.hibernate.community.dialect.GaussDBDialect;
2624
import org.junit.jupiter.api.Test;
2725

2826
/**
@@ -40,7 +38,6 @@
4038
public class LazyInitializationWithoutInlineDirtyTrackingTest {
4139

4240
@Test
43-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB does not support byte array operations through lob type")
4441
public void test(SessionFactoryScope scope) {
4542
scope.inTransaction( s -> {
4643
File file = new File();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import org.junit.Test;
1414

1515
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
16-
import org.hibernate.testing.orm.junit.SkipForDialect;
17-
import org.hibernate.community.dialect.GaussDBDialect;
1816
import static org.junit.Assert.assertArrayEquals;
1917

2018
/**
@@ -30,7 +28,6 @@ protected Class<?>[] getAnnotatedClasses() {
3028
}
3129

3230
@Test
33-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB does not support byte array operations through lob type")
3431
public void test() {
3532
Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
3633
final Product product = new Product();

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.hibernate.annotations.JavaType;
1414
import org.hibernate.cfg.AvailableSettings;
1515
import org.hibernate.dialect.Dialect;
16-
import org.hibernate.community.dialect.GaussDBDialect;
1716
import org.hibernate.metamodel.mapping.JdbcMapping;
1817
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
1918
import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
@@ -28,7 +27,6 @@
2827
import org.hibernate.testing.orm.junit.SessionFactory;
2928
import org.hibernate.testing.orm.junit.SessionFactoryScope;
3029
import org.hibernate.testing.orm.junit.Setting;
31-
import org.hibernate.testing.orm.junit.SkipForDialect;
3230
import org.junit.jupiter.api.AfterEach;
3331
import org.junit.jupiter.api.Test;
3432

@@ -49,7 +47,6 @@
4947
public class ByteArrayMappingTests {
5048

5149
@Test
52-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB does not support byte array operations through lob type")
5350
public void verifyMappings(SessionFactoryScope scope) {
5451
final MappingMetamodelImplementor mappingMetamodel = scope.getSessionFactory()
5552
.getRuntimeMetamodels()

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.hibernate.annotations.Nationalized;
1010
import org.hibernate.cfg.AvailableSettings;
1111
import org.hibernate.dialect.Dialect;
12-
import org.hibernate.community.dialect.GaussDBDialect;
1312
import org.hibernate.dialect.NationalizationSupport;
1413
import org.hibernate.metamodel.mapping.JdbcMapping;
1514
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
@@ -22,7 +21,6 @@
2221
import org.hibernate.testing.orm.junit.SessionFactory;
2322
import org.hibernate.testing.orm.junit.SessionFactoryScope;
2423
import org.hibernate.testing.orm.junit.Setting;
25-
import org.hibernate.testing.orm.junit.SkipForDialect;
2624
import org.junit.jupiter.api.AfterEach;
2725
import org.junit.jupiter.api.Test;
2826

@@ -49,7 +47,6 @@
4947
public class WrapperArrayHandlingLegacyTests {
5048

5149
@Test
52-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "GaussDB does not support byte array operations through lob type")
5350
public void verifyByteArrayMappings(SessionFactoryScope scope) {
5451
final MappingMetamodelImplementor mappingMetamodel = scope.getSessionFactory()
5552
.getRuntimeMetamodels()

hibernate-hikaricp/src/test/java/org/hibernate/test/hikaricp/HikariTransactionIsolationConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
@SkipForDialect(value = SybaseDialect.class, comment = "The jTDS driver doesn't implement Connection#getNetworkTimeout() so this fails")
2121
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
2222
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
23-
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB query serialization level of SERIALIZABLE has some problem")
23+
@SkipForDialect(value = GaussDBDialect.class, comment = "GaussDB does not support SERIALIZABLE isolation")
2424
public class HikariTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2525
@Override
2626
protected ConnectionProvider getConnectionProviderUnderTest() {

0 commit comments

Comments
 (0)