Commit a902e06

committed

Fix Cockroach CI failures

1 parent 5bb2b27 commit a902e06Copy full SHA for a902e06

File tree

-5

lines changed

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect
- CockroachLegacyDialect.java
hibernate-core/src/main/java/org/hibernate/dialect
- CockroachDialect.java
hibernate-testing/src/main/java/org/hibernate/testing/orm/junit
- DialectFeatureChecks.java

-5

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@`
`75`	`75`	`import org.hibernate.type.descriptor.jdbc.BlobJdbcType;`
`76`	`76`	`import org.hibernate.type.descriptor.jdbc.ClobJdbcType;`
`77`	`77`	`import org.hibernate.type.descriptor.jdbc.JdbcType;`
`78`		`-import org.hibernate.type.descriptor.jdbc.NClobJdbcType;`
`79`	`78`	`import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;`
`80`	`79`	`import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;`
`81`	`80`	`import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;`
`@@ -421,7 +420,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser`
`421`	`420`	`// Force Blob binding to byte[] for CockroachDB`
`422`	`421`	`jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.MATERIALIZED );`
`423`	`422`	`jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.MATERIALIZED );`
`424`		`- jdbcTypeRegistry.addDescriptor( Types.NCLOB, NClobJdbcType.MATERIALIZED );`
	`423`	`+ jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.MATERIALIZED );`
`425`	`424`
`426`	`425`	`// The next two contributions are the same as for Postgresql`
`427`	`426`	`typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@`
`67`	`67`	`import org.hibernate.type.descriptor.jdbc.BlobJdbcType;`
`68`	`68`	`import org.hibernate.type.descriptor.jdbc.ClobJdbcType;`
`69`	`69`	`import org.hibernate.type.descriptor.jdbc.JdbcType;`
`70`		`-import org.hibernate.type.descriptor.jdbc.NClobJdbcType;`
`71`	`70`	`import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;`
`72`	`71`	`import org.hibernate.type.descriptor.jdbc.UUIDJdbcType;`
`73`	`72`	`import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;`
`@@ -384,7 +383,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser`
`384`	`383`	`// Force Blob binding to byte[] for CockroachDB`
`385`	`384`	`jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.MATERIALIZED );`
`386`	`385`	`jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.MATERIALIZED );`
`387`		`- jdbcTypeRegistry.addDescriptor( Types.NCLOB, NClobJdbcType.MATERIALIZED );`
	`386`	`+ jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.MATERIALIZED );`
`388`	`387`
`389`	`388`	`// The next two contributions are the same as for Postgresql`
`390`	`389`	`typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -457,7 +457,6 @@ public boolean apply(Dialect dialect) {`
`457`	`457`	`public static class SupportsCteInsertStrategy implements DialectFeatureCheck {`
`458`	`458`	`public boolean apply(Dialect dialect) {`
`459`	`459`	`return dialect instanceof PostgreSQLDialect`
`460`		`- \|\| dialect instanceof CockroachDialect`
`461`	`460`	`\|\| dialect instanceof DB2Dialect`
`462`	`461`	`\|\| dialect instanceof GaussDBDialect;`
`463`	`462`	`}`

Comments

(0)