Skip to content

Commit c92bfdc

Browse files
committed
More CockroachDB CI fixes
1 parent 26a11f8 commit c92bfdc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/locking/options/LockedRowsTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import jakarta.persistence.Timeout;
99
import org.hibernate.PessimisticLockException;
1010
import org.hibernate.community.dialect.InformixDialect;
11+
import org.hibernate.dialect.CockroachDialect;
1112
import org.hibernate.dialect.MariaDBDialect;
1213
import org.hibernate.dialect.lock.PessimisticEntityLockException;
1314
import org.hibernate.jpa.SpecHints;
@@ -87,6 +88,7 @@ void testFindNoWait(SessionFactoryScope factoryScope) {
8788
@Test
8889
@RequiresDialectFeature(feature = DialectFeatureChecks.SupportNoWait.class)
8990
@SkipForDialect(dialectClass = InformixDialect.class, reason = "no failure")
91+
@SkipForDialect(dialectClass = CockroachDialect.class, reason = "Seems FOR UPDATE locks might block read accesses of other TXs")
9092
void testLockNoWait(SessionFactoryScope factoryScope) {
9193
factoryScope.inTransaction( (session) -> {
9294
session.find(Book.class,1, PESSIMISTIC_WRITE);

hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.hibernate.dialect.SybaseDialect;
1616
import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
1717
import org.hibernate.type.descriptor.jdbc.IntegerJdbcType;
18-
import org.hibernate.type.descriptor.jdbc.VarbinaryJdbcType;
1918
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
2019

2120
import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
@@ -54,7 +53,7 @@ public void testStandardBasicSqlTypeDescriptor() {
5453
// A few dialects explicitly override BlobTypeDescriptor.DEFAULT
5554
if ( CockroachDialect.class.isInstance( dialect ) ) {
5655
assertSame(
57-
VarbinaryJdbcType.INSTANCE,
56+
BlobJdbcType.MATERIALIZED,
5857
jdbcTypeRegistry.getDescriptor( Types.BLOB )
5958
);
6059
}

0 commit comments

Comments
 (0)