Merge branch 'main' into dialect_case_insensitive_query_pattern

Author: dnovitski

documentation/src/main/asciidoc/introduction/Interacting.adoc

@@ -241,6 +241,8 @@ When a transaction rolls back, Hibernate makes no attempt to roll back the state
 After a transaction rollback, the persistence context must be discarded, and the state of its entities must be assumed inconsistent with the state held by the database.
 ====
 
+The interface link:{doc-javadoc-url}org/hibernate/Transaction.html[`Transaction`] extends `EntityTransaction` with some additional operations, including the ability to register transaction completion callbacks.
+
 [[persistence-operations]]
 === Operations on the persistence context
 
@@ -743,13 +745,13 @@ session.getTransaction().commit();
 | `ALWAYS` | | Flush before transaction commit, and before execution of every query
 |===
 
-A second way to reduce the cost of flushing is to load entities in _read-only_ mode:
+A second way to reduce the cost of flushing is to load entities in link:{doc-javadoc-url}org/hibernate/Session.html#setDefaultReadOnly(boolean)[_read-only_ mode]:
 
 - `Session.setDefaultReadOnly(true)` specifies that all entities loaded by a given session should be loaded in read-only mode by default,
 - `SelectionQuery.setReadOnly(true)` specifies that every entity returned by a given query should be loaded in read-only mode, and
 - `Session.setReadOnly(Object, true)` specifies that a given entity already loaded by the session should be switched to read-only mode.
 
-Hibernate's `ReadOnlyMode` is a custom `FindOption`:
+Hibernate's link:{doc-javadoc-url}org/hibernate/ReadOnlyMode.html[`ReadOnlyMode`] is a custom `FindOption`:
 
 [source,java]
 ----

documentation/src/main/asciidoc/introduction/Mapping.adoc

@@ -168,6 +168,15 @@ is a bad idea, since it's impossible to create a foreign key constraint that tar
 // Hibernate doesn't support mixing ``InheritanceType``s within a single entity hierarchy.
 // However, it's possible to emulate a mix of `SINGLE_TABLE` and `JOINED` inheritance using the `@SecondaryTable` annotation.
 
+[CAUTION]
+====
+It's quite easy to overuse inheritance.
+We've occasionally seen extreme cases where a `JOINED` inheritance hierarchy includes _hundreds_ of entities, spanning hundreds of tables.
+Efficiently querying such a hierarchy is an almost impossible task for Hibernate.
+Fortunately, a `JOINED` inheritance relationship can always be remodeled as a <<one-to-one-pk,one-to-one association>>, allowing much more efficient queries.
+In general, a single entity inheritance hierarchy should never span more than a few tables, including secondary tables.
+====
+
 [[table-mappings]]
 === Mapping to tables
 

documentation/src/main/asciidoc/querylanguage/Expressions.adoc

@@ -1495,7 +1495,7 @@ Their syntax is defined by:
 include::{extrasdir}/predicate_like_bnf.txt[]
 ----
 
-The expression on the right is a pattern, where:
+The expression on the right is usually a SQL-style pattern, where:
 
 * `_` matches any single character,
 * `%` matches any number of characters, and
@@ -1509,6 +1509,14 @@ from Book where title not like '% for Dummies'
 
 The optional `escape` character allows a pattern to include a literal `_` or `%` character.
 
+Alternatively, the `regexp` keyword specifies that the pattern should be interpreted as a regular expression:
+
+[[like-regexp-predicate-example]]
+[source, hql]
+----
+from Book where title not like regexp '.+ for Dummies'
+----
+
 As you can guess, `not like` and `not ilike` are the enemies of `like` and `ilike`, and evaluate to the exact opposite boolean values.
 
 [[in-predicate]]

documentation/src/main/asciidoc/querylanguage/extras/predicate_like_bnf.txt

@@ -1 +1 @@
-expression "NOT"? ("LIKE" | "ILIKE") expression ("ESCAPE" character)?
+expression "NOT"? ("LIKE" | "ILIKE") REGEXP? expression ("ESCAPE" character)?

documentation/src/main/asciidoc/topical/registries/ServiceRegistries.adoc

@@ -28,7 +28,7 @@ service is defined by the interface (service role) +org.hibernate.engine.jdbc.co
 which declares methods for obtaining and releasing the Connections.  There are then multiple implementations of that
 service contract, varying in how they actually manage the Connections:
 
-* +org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl+ for using a +javax.sql.DataSource+
+* +org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider+ for using a +javax.sql.DataSource+
 * +org.hibernate.c3p0.internal.C3P0ConnectionProvider+ for using a C3P0 Connection pool
 * etc.
 

hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java

@@ -7,7 +7,6 @@
 import java.io.Serial;
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.sql.DataSource;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -84,9 +83,9 @@ public class AgroalConnectionProvider implements ConnectionProvider, Configurabl
 
 	private static String extractIsolationAsString(Map<String, Object> properties) {
 		final Integer isolation = ConnectionProviderInitiator.extractIsolation( properties );
-		return isolation != null ?
+		return isolation != null
 				// Agroal resolves transaction isolation from the 'nice' name
-				toIsolationNiceName( isolation )
+				? toIsolationNiceName( isolation )
 				: null;
 	}
 
@@ -116,9 +115,7 @@ public void configure(Map<String, Object> properties) throws HibernateException
 								: String.valueOf( 10 );
 				config.put( AgroalSettings.AGROAL_MAX_SIZE, maxSize );
 			}
-			final AgroalPropertiesReader agroalProperties =
-					new AgroalPropertiesReader( CONFIG_PREFIX )
-							.readProperties( config );
+			final var agroalProperties = new AgroalPropertiesReader( CONFIG_PREFIX ).readProperties( config );
 			agroalProperties.modify()
 					.connectionPoolConfiguration( cp -> cp.connectionFactoryConfiguration( cf -> {
 				copyProperty( properties, JdbcSettings.DRIVER, cf::connectionProviderClassName, identity() );
@@ -205,22 +202,22 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
 
 	@Override
 	public boolean isUnwrappableAs(Class<?> unwrapType) {
-		return ConnectionProvider.class.equals( unwrapType )
-			|| AgroalConnectionProvider.class.isAssignableFrom( unwrapType )
-			|| DataSource.class.isAssignableFrom( unwrapType );
+		return unwrapType.isAssignableFrom( AgroalConnectionProvider.class )
+			|| unwrapType.isAssignableFrom( AgroalDataSource.class );
 	}
 
 	@Override
 	@SuppressWarnings( "unchecked" )
 	public <T> T unwrap(Class<T> unwrapType) {
-		if ( ConnectionProvider.class.equals( unwrapType )
-				|| AgroalConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
+		if ( unwrapType.isAssignableFrom( AgroalConnectionProvider.class ) ) {
 			return (T) this;
 		}
-		if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
+		else if ( unwrapType.isAssignableFrom( AgroalDataSource.class ) ) {
 			return (T) agroalDataSource;
 		}
-		throw new UnknownUnwrapTypeException( unwrapType );
+		else {
+			throw new UnknownUnwrapTypeException( unwrapType );
+		}
 	}
 
 	// --- Stoppable

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java

@@ -115,19 +115,17 @@ public void closeConnection(Connection connection) throws SQLException {
 
 	@Override
 	public boolean isUnwrappableAs(Class<?> unwrapType) {
-		return ConnectionProvider.class.equals( unwrapType )
-			|| C3P0ConnectionProvider.class.isAssignableFrom( unwrapType )
-			|| DataSource.class.isAssignableFrom( unwrapType );
+		return unwrapType.isAssignableFrom( C3P0ConnectionProvider.class )
+			|| unwrapType.isAssignableFrom( DataSource.class );
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> unwrapType) {
-		if ( ConnectionProvider.class.equals( unwrapType )
-				|| C3P0ConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
+		if ( unwrapType.isAssignableFrom( C3P0ConnectionProvider.class ) ) {
 			return (T) this;
 		}
-		else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
+		else if ( unwrapType.isAssignableFrom( DataSource.class ) ) {
 			return (T) dataSource;
 		}
 		else {

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

@@ -75,7 +75,6 @@
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
 import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.descriptor.jdbc.NClobJdbcType;
 import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
@@ -421,7 +420,7 @@ protected void contributeCockroachTypes(TypeContributions typeContributions, Ser
 		// Force Blob binding to byte[] for CockroachDB
 		jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.MATERIALIZED );
 		jdbcTypeRegistry.addDescriptor( Types.CLOB, ClobJdbcType.MATERIALIZED );
-		jdbcTypeRegistry.addDescriptor( Types.NCLOB, NClobJdbcType.MATERIALIZED );
+		jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.MATERIALIZED );
 
 		// The next two contributions are the same as for Postgresql
 		typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );

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

@@ -214,7 +214,6 @@ private LockingSupport buildLockingSupport() {
 		return new HANALockingSupport( supportsSkipLocked );
 	}
 
-
 	@Override
 	public DatabaseVersion determineDatabaseVersion(DialectResolutionInfo info) {
 		return HANALegacyServerConfiguration.staticDetermineDatabaseVersion( info );
@@ -652,7 +651,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
 
 	@Override
 	public LockingSupport getLockingSupport() {
-		return HANALockingSupport.HANA_LOCKING_SUPPORT;
+		return lockingSupport;
 	}
 
 	@Override
@@ -885,16 +884,6 @@ public SequenceSupport getSequenceSupport() {
 		return HANASequenceSupport.INSTANCE;
 	}
 
-	@Override
-	public boolean supportsTableCheck() {
-		return true;
-	}
-
-	@Override
-	public boolean supportsTupleDistinctCounts() {
-		return true;
-	}
-
 	@Override
 	public boolean dropConstraints() {
 		return false;

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

@@ -367,6 +367,8 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		final TypeConfiguration typeConfiguration = functionContributions.getTypeConfiguration();
 		final BasicType<String> stringBasicType =
 				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.STRING );
+		final BasicType<Boolean> booleanBasicType =
+				typeConfiguration.getBasicTypeRegistry().resolve( StandardBasicTypes.BOOLEAN );
 
 		functionRegistry.registerAlternateKey( "var_samp", "variance" );
 
@@ -408,6 +410,12 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		// parameter arguments to trim() require a cast
 		functionContributions.getFunctionRegistry().register( "trim",
 				new TrimFunction( this, typeConfiguration, SqlAstNodeRenderingMode.NO_UNTYPED ) );
+
+		//TODO: emulate support for the 'i' flag argument
+		functionRegistry.namedDescriptorBuilder( "regexp_like", "regex_match"  )
+				.setParameterTypes( STRING, STRING )
+				.setInvariantType( booleanBasicType )
+				.register();
 	}
 
 	@Override
@@ -572,9 +580,18 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public LockingSupport getLockingSupport() {
+		// TODO: need a custom impl, because:
+		//       1. Informix does not support 'skip locked'
+		//       2. Informix does not allow 'for update' with joins
 		return LockingSupportSimple.STANDARD_SUPPORT;
 	}
 
+	// TODO: remove once we have a custom LockingSupport impl
+	@Override @Deprecated(forRemoval = true)
+	public boolean supportsSkipLocked() {
+		return false;
+	}
+
 	@Override
 	public boolean supportsIfExistsBeforeTableName() {
 		return getVersion().isSameOrAfter( 11, 70 );