6.6 backports

ci/jpa-3.1-tck.Jenkinsfile

@@ -34,6 +34,7 @@ pipeline {
     stages {
         stage('Build') {
         	steps {
+                requireApprovalForPullRequest 'hibernate'
 				script {
 					docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
 						docker.image('openjdk:11-jdk').pull()

ci/quarkus.Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('hibernate-jenkins-pipeline-helpers@1.5') _
+@Library('hibernate-jenkins-pipeline-helpers@1.13') _
 
 // Avoid running the pipeline on branch indexing
 if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
@@ -28,6 +28,7 @@ pipeline {
     stages {
         stage('Build') {
         	steps {
+                requireApprovalForPullRequest 'hibernate'
 				script {
 					dir('hibernate') {
 						checkout scm

docker_db.sh

@@ -908,8 +908,11 @@ informix() {
 }
 
 informix_14_10() {
+    temp_dir=$(mktemp -d)
+    echo "ALLOW_NEWLINE 1" >$temp_dir/onconfig.mod
+    chmod 777 -R $temp_dir
     $PRIVILEGED_CLI $CONTAINER_CLI rm -f informix || true
-    $PRIVILEGED_CLI $CONTAINER_CLI run --name informix --privileged -p 9088:9088 -e LICENSE=accept -e GL_USEGLU=1 -d ${DB_IMAGE_INFORMIX_14_10:-icr.io/informix/informix-developer-database:14.10.FC9W1DE}
+    $PRIVILEGED_CLI $CONTAINER_CLI run --name informix --privileged -p 9088:9088 -v $temp_dir:/opt/ibm/config -e LICENSE=accept -e GL_USEGLU=1 -d ${DB_IMAGE_INFORMIX_14_10:-icr.io/informix/informix-developer-database:14.10.FC9W1DE}
     echo "Starting Informix. This can take a few minutes"
     # Give the container some time to start
     OUTPUT=

gradle/databases.gradle

@@ -295,7 +295,7 @@ ext {
                         'jdbc.driver': 'com.informix.jdbc.IfxDriver',
                         'jdbc.user'  : 'informix',
                         'jdbc.pass'  : 'in4mix',
-                        'jdbc.url'   : 'jdbc:informix-sqli://' + dbHost + ':9088/dev:INFORMIXSERVER=informix;user=informix;password=in4mix;DELIMIDENT=Y;DB_LOCALE=en_US.utf8',
+                        'jdbc.url'   : 'jdbc:informix-sqli://' + dbHost + ':9088/dev:INFORMIXSERVER=informix;user=informix;password=in4mix;DBDATE=Y4MD-;DELIMIDENT=Y;DB_LOCALE=en_US.utf8',
                         'jdbc.datasource' : 'com.informix.jdbc.IfxDriver',
 //                        'jdbc.datasource' : 'com.informix.jdbcx.IfxDataSource',
                         'connection.init_sql' : ''

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

@@ -55,11 +55,13 @@
 import org.hibernate.query.sqm.mutation.internal.temptable.LocalTemporaryTableMutationStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy;
 import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy;
+import org.hibernate.query.sqm.produce.function.StandardFunctionArgumentTypeResolvers;
 import org.hibernate.query.sqm.sql.SqmTranslator;
 import org.hibernate.query.sqm.sql.SqmTranslatorFactory;
 import org.hibernate.query.sqm.sql.StandardSqmTranslatorFactory;
 import org.hibernate.query.sqm.tree.select.SqmSelectStatement;
 import org.hibernate.service.ServiceRegistry;
+import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.SqlAstTranslator;
 import org.hibernate.sql.ast.SqlAstTranslatorFactory;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -71,7 +73,10 @@
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 import org.hibernate.tool.schema.internal.StandardForeignKeyExporter;
 import org.hibernate.tool.schema.spi.Exporter;
+import org.hibernate.type.JavaObjectType;
+import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.jdbc.ClobJdbcType;
+import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 import org.hibernate.type.descriptor.sql.DdlType;
 import org.hibernate.type.descriptor.sql.internal.CapacityDependentDdlType;
@@ -82,6 +87,7 @@
 import jakarta.persistence.TemporalType;
 
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
+import static org.hibernate.query.sqm.produce.function.FunctionParameterType.STRING;
 import static org.hibernate.type.SqlTypes.BIGINT;
 import static org.hibernate.type.SqlTypes.BINARY;
 import static org.hibernate.type.SqlTypes.FLOAT;
@@ -276,10 +282,10 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		super.initializeFunctionRegistry(functionContributions);
 
 		CommonFunctionFactory functionFactory = new CommonFunctionFactory(functionContributions);
+		functionFactory.aggregates( this, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
 		functionFactory.instr();
 		functionFactory.substr();
-		functionFactory.substring_substr();
-		//also natively supports ANSI-style substring()
+		functionFactory.substringFromFor();
 		functionFactory.trunc();
 		functionFactory.trim2();
 		functionFactory.space();
@@ -302,12 +308,30 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.monthsBetween();
 		functionFactory.stddev();
 		functionFactory.variance();
-		functionFactory.locate_positionSubstring();
+		functionFactory.bitLength_pattern( "length(?1)*8" );
+
+		if ( getVersion().isSameOrAfter( 12 ) ) {
+			functionFactory.locate_charindex();
+		}
 
 		//coalesce() and nullif() both supported since Informix 12
 
 		functionContributions.getFunctionRegistry().register( "least", new CaseLeastGreatestEmulation( true ) );
 		functionContributions.getFunctionRegistry().register( "greatest", new CaseLeastGreatestEmulation( false ) );
+		functionContributions.getFunctionRegistry().namedDescriptorBuilder( "matches" )
+				.setInvariantType( functionContributions.getTypeConfiguration()
+						.getBasicTypeRegistry()
+						.resolve( StandardBasicTypes.STRING )
+				)
+				.setExactArgumentCount( 2 )
+				.setArgumentTypeResolver(
+						StandardFunctionArgumentTypeResolvers.impliedOrInvariant(
+								functionContributions.getTypeConfiguration(),
+								STRING
+						)
+				)
+				.setArgumentListSignature( "(STRING string, STRING pattern)" )
+				.register();
 		if ( supportsWindowFunctions() ) {
 			functionFactory.windowFunctions();
 		}
@@ -672,6 +696,11 @@ public String currentDate() {
 		return "today";
 	}
 
+	@Override
+	public String currentTime() {
+		return currentTimestamp();
+	}
+
 	@Override
 	public String currentTimestamp() {
 		return "current";
@@ -816,6 +845,17 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 		jdbcTypeRegistry.addDescriptor( Types.NCLOB, ClobJdbcType.DEFAULT );
 		typeContributions.contributeJdbcType( VarcharUUIDJdbcType.INSTANCE );
+		typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE );
+
+		// Until we remove StandardBasicTypes, we have to keep this
+		typeContributions.contributeType(
+				new JavaObjectType(
+						ObjectNullAsBinaryTypeJdbcType.INSTANCE,
+						typeContributions.getTypeConfiguration()
+								.getJavaTypeRegistry()
+								.getDescriptor( Object.class )
+				)
+		);
 	}
 
 	@Override

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java

@@ -181,6 +181,23 @@
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-18369")
+	public void testMatches(SessionFactoryScope scope) {
+		scope.inTransaction(
+				(session) -> {
+					String country = (String) session.createQuery(
+									"select e.country " +
+											"from Event e " +
+											"where e.id = :id and matches(e.country, :country) = 'T'" )
+							.setParameter( "id", event.id )
+							.setParameter( "country", "R*" )
+							.getSingleResult();
+					assertEquals( "Romania", country );
+				}
+		);
+	}
+
 	private Calendar todayCalendar() {
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.HOUR_OF_DAY, 0);

hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java

@@ -70,6 +70,7 @@ public String getHqlString() {
 	public NamedSqmQueryMemento resolve(SessionFactoryImplementor factory) {
 		return new NamedHqlQueryMementoImpl(
 				getRegistrationName(),
+				null,
 				hqlString,
 				firstResult,
 				maxResults,

hibernate-core/src/main/java/org/hibernate/boot/internal/NamedNativeQueryDefinitionImpl.java

@@ -18,6 +18,8 @@
 import org.hibernate.query.sql.internal.NamedNativeQueryMementoImpl;
 import org.hibernate.query.sql.spi.NamedNativeQueryMemento;
 
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
 
 /**
@@ -86,15 +88,16 @@ public String getResultSetMappingClassName() {
 
 	@Override
 	public NamedNativeQueryMemento resolve(SessionFactoryImplementor factory) {
+		Class<?> resultClass = isNotEmpty( resultSetMappingClassName )
+				? factory.getServiceRegistry().requireService( ClassLoaderService.class ).classForName( resultSetMappingClassName )
+				: null;
 		return new NamedNativeQueryMementoImpl(
 				getRegistrationName(),
+				resultClass,
 				sqlString,
 				sqlString,
 				resultSetMappingName,
-				isNotEmpty( resultSetMappingClassName )
-						? factory.getServiceRegistry().requireService( ClassLoaderService.class )
-								.classForName( resultSetMappingClassName )
-						: null,
+				resultClass,
 				querySpaces,
 				getCacheable(),
 				getCacheRegion(),

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java

@@ -629,15 +629,15 @@ private static List<PropertyData> collectClassElements(
 		//embeddable elements can have type defs
 		final PropertyContainer container =
 				new PropertyContainer( returnedClassOrElement, annotatedClass, propertyAccessor );
-		addElementsOfClass( classElements, container, context);
+		addElementsOfClass( classElements, container, context, 0 );
 		//add elements of the embeddable's mapped superclasses
 		XClass subclass = returnedClassOrElement;
 		XClass superClass;
 		while ( isValidSuperclass( superClass = subclass.getSuperclass(), isIdClass ) ) {
 			//FIXME: proper support of type variables incl var resolved at upper levels
 			final PropertyContainer superContainer =
 					new PropertyContainer( superClass, annotatedClass, propertyAccessor );
-			addElementsOfClass( classElements, superContainer, context );
+			addElementsOfClass( classElements, superContainer, context, 0 );
 			if ( subclassToSuperclass != null ) {
 				subclassToSuperclass.put( subclass.getName(), superClass.getName() );
 			}
@@ -668,7 +668,7 @@ private static void collectSubclassElements(
 			assert put == null;
 			// collect property of subclass
 			final PropertyContainer superContainer = new PropertyContainer( subclass, superclass, propertyAccessor );
-			addElementsOfClass( classElements, superContainer, context );
+			addElementsOfClass( classElements, superContainer, context, 0 );
 			// recursively do that same for all subclasses
 			collectSubclassElements(
 					propertyAccessor,
@@ -739,7 +739,7 @@ private static List<PropertyData> collectBaseClassElements(
 			while ( !Object.class.getName().equals( baseReturnedClassOrElement.getName() ) ) {
 				final PropertyContainer container =
 						new PropertyContainer( baseReturnedClassOrElement, annotatedClass, propertyAccessor );
-				addElementsOfClass( baseClassElements, container, context );
+				addElementsOfClass( baseClassElements, container, context, 0 );
 				baseReturnedClassOrElement = baseReturnedClassOrElement.getSuperclass();
 			}
 			return baseClassElements;

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EntityBinder.java

@@ -617,7 +617,8 @@ private static PropertyData getUniqueIdPropertyFromBaseClass(
 				inferredData.getPropertyClass(),
 				propertyAccessor
 		);
-		addElementsOfClass( baseClassElements, propContainer, context );
+		final int idPropertyCount = addElementsOfClass( baseClassElements, propContainer, context, 0 );
+		assert idPropertyCount == 1;
 		//Id properties are on top and there is only one
 		return baseClassElements.get( 0 );
 	}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/InheritanceState.java

@@ -234,12 +234,11 @@ private ElementsToProcess getElementsToProcess() {
 						clazz,
 						accessType
 				);
-				int currentIdPropertyCount = addElementsOfClass(
+				idPropertyCount = addElementsOfClass(
 						elements,
 						propertyContainer,
-						buildingContext
-				);
-				idPropertyCount += currentIdPropertyCount;
+						buildingContext,
+						idPropertyCount );
 			}
 
 			if ( idPropertyCount == 0 && !inheritanceState.hasParents() ) {

hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyBinder.java

@@ -555,17 +555,17 @@ private void validateOptimisticLock(OptimisticLock optimisticLock) {
 	/**
 	 * @param elements List of {@link PropertyData} instances
 	 * @param propertyContainer Metadata about a class and its properties
+	 * @param idPropertyCounter number of id properties already present in list of {@link PropertyData} instances
 	 *
-	 * @return the number of id properties found while iterating the elements of
-	 *         {@code annotatedClass} using the determined access strategy
+	 * @return total number of id properties found after iterating the elements of {@code annotatedClass}
+	 * using the determined access strategy (starting from the provided {@code idPropertyCounter})
 	 */
 	static int addElementsOfClass(
 			List<PropertyData> elements,
 			PropertyContainer propertyContainer,
-			MetadataBuildingContext context) {
-		int idPropertyCounter = 0;
+			MetadataBuildingContext context, int idPropertyCounter) {
 		for ( XProperty property : propertyContainer.propertyIterator() ) {
-			idPropertyCounter += addProperty( propertyContainer, property, elements, context );
+			idPropertyCounter = addProperty( propertyContainer, property, elements, context, idPropertyCounter );
 		}
 		return idPropertyCounter;
 	}
@@ -574,20 +574,20 @@ private static int addProperty(
 			PropertyContainer propertyContainer,
 			XProperty property,
 			List<PropertyData> inFlightPropertyDataList,
-			MetadataBuildingContext context) {
+			MetadataBuildingContext context,
+			int idPropertyCounter) {
 		// see if inFlightPropertyDataList already contains a PropertyData for this name,
 		// and if so, skip it..
 		for ( PropertyData propertyData : inFlightPropertyDataList ) {
 			if ( propertyData.getPropertyName().equals( property.getName() ) ) {
 				checkIdProperty( property, propertyData );
 				// EARLY EXIT!!!
-				return 0;
+				return idPropertyCounter;
 			}
 		}
 
 		final XClass declaringClass = propertyContainer.getDeclaringClass();
 		final XClass entity = propertyContainer.getEntityAtStake();
-		int idPropertyCounter = 0;
 		final PropertyData propertyAnnotatedElement = new PropertyInferredData(
 				declaringClass,
 				property,