HHH-9952 Formula in join columns lead to several errors

Author: dreab8

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java

@@ -6,10 +6,8 @@
  */
 package org.hibernate.hql.internal.ast.tree;
 
-import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.type.Type;
 
 import antlr.collections.AST;
@@ -64,7 +62,7 @@ private void mutateRowValueConstructorSyntax(int operandColumnSpan) {
 		setType( expansionConnectorType );
 		setText( expansionConnectorText );
 
-		String[] mutationTexts = extractMutationTexts( getOperand(), operandColumnSpan );
+		String[] mutationTexts = BinaryLogicOperatorNode.extractMutationTexts( getOperand(), operandColumnSpan );
 
 		AST container = this;
 		for ( int i = operandColumnSpan - 1; i > 0; i-- ) {
@@ -102,40 +100,4 @@ private static Type extractDataType(Node operand) {
 		return null;
 	}
 
-	private static String[] extractMutationTexts(Node operand, int count) {
-		if ( operand instanceof ParameterNode ) {
-			String[] rtn = new String[count];
-			for ( int i = 0; i < count; i++ ) {
-				rtn[i] = "?";
-			}
-			return rtn;
-		}
-		else if ( operand.getType() == HqlSqlTokenTypes.VECTOR_EXPR ) {
-			final String[] rtn = new String[ operand.getNumberOfChildren() ];
-			AST node = operand.getFirstChild();
-			int x = 0;
-			while ( node != null ) {
-				rtn[ x++ ] = node.getText();
-				node = node.getNextSibling();
-			}
-			return rtn;
-		}
-		else if ( operand instanceof SqlNode ) {
-			String nodeText = operand.getText();
-			if ( nodeText.startsWith( "(" ) ) {
-				nodeText = nodeText.substring( 1 );
-			}
-			if ( nodeText.endsWith( ")" ) ) {
-				nodeText = nodeText.substring( 0, nodeText.length() - 1 );
-			}
-			String[] splits = StringHelper.split( ", ", nodeText );
-			if ( count != splits.length ) {
-				throw new HibernateException( "SqlNode's text did not reference expected number of columns" );
-			}
-			return splits;
-		}
-		else {
-			throw new HibernateException( "don't know how to extract row value elements from node : " + operand );
-		}
-	}
 }

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java

@@ -263,7 +263,7 @@ else if ( operand instanceof SqlNode ) {
 			if ( nodeText.endsWith( ")" ) ) {
 				nodeText = nodeText.substring( 0, nodeText.length() - 1 );
 			}
-			String[] splits = StringHelper.split( ", ", nodeText );
+			String[] splits = StringHelper.split( ",", nodeText );
 			if ( count != splits.length ) {
 				throw new HibernateException( "SqlNode's text did not reference expected number of columns" );
 			}

hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java

@@ -637,7 +637,7 @@ public SqlValueReference[] map(String reference) {
 				formulaTemplates = elementFormulaTemplates;
 			}
 			else {
-				columnNames = elementPropertyMapping.toColumns( reference );
+				columnNames = columnNames( reference );
 				formulaTemplates = formulaTemplates( reference, columnNames.length );
 			}
 
@@ -670,6 +670,20 @@ public String getColumnName() {
 		}
 	}
 
+	private String[] columnNames(String reference) {
+		if ( elementPersister == null ) {
+			return elementPropertyMapping.toColumns( reference );
+		}
+
+		final Integer propertyIndex = elementPersister.getEntityMetamodel().getPropertyIndexOrNull( reference );
+		if ( propertyIndex != null ) {
+			return ( (Queryable) elementPersister ).getSubclassPropertyColumnNameClosure()[propertyIndex];
+		}
+		else {
+			return elementPropertyMapping.toColumns( reference );
+		}
+	}
+
 	private String[] formulaTemplates(String reference, int expectedSize) {
 		try {
 			final int propertyIndex = elementPersister.getEntityMetamodel().getPropertyIndex( reference );

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -2032,7 +2032,7 @@ public String[] toColumns(String alias, String propertyName) throws QueryExcepti
 	 */
 	@Override
 	public String[] toColumns(String propertyName) throws QueryException {
-		return propertyMapping.getColumnNames( propertyName );
+		return propertyMapping.toColumns( propertyName );
 	}
 
 	/**
@@ -2224,7 +2224,8 @@ protected Type[] getSubclassPropertyTypeClosure() {
 		return subclassPropertyTypeClosure;
 	}
 
-	protected String[][] getSubclassPropertyColumnNameClosure() {
+	@Override
+	public String[][] getSubclassPropertyColumnNameClosure() {
 		return subclassPropertyColumnNameClosure;
 	}
 
@@ -2821,7 +2822,23 @@ else if ( isAllOrDirtyOptLocking() && oldFields != null ) {
 					String[] propertyColumnWriters = getPropertyColumnWriters( i );
 					boolean[] propertyNullness = types[i].toColumnNullness( oldFields[i], getFactory() );
 					for ( int k = 0; k < propertyNullness.length; k++ ) {
-						if ( propertyNullness[k] ) {
+						if ( propertyColumnNames[k] == null && propertyColumnFormulaTemplates[k] != null ) {
+							String formula = StringHelper.replace(
+									propertyColumnFormulaTemplates[k][i],
+									Template.TEMPLATE + ".",
+									""
+							);
+							if ( propertyNullness[k] ) {
+								update.addWhereColumn(
+										formula,
+										"=" + ( propertyColumnWriters[k] == null ? "?" : propertyColumnWriters[k] )
+								);
+							}
+							else {
+								update.addWhereColumn( formula, " is null" );
+							}
+						}
+						else if ( propertyNullness[k] ) {
 							update.addWhereColumn( propertyColumnNames[k], "=" + propertyColumnWriters[k] );
 						}
 						else {
@@ -2830,7 +2847,6 @@ else if ( isAllOrDirtyOptLocking() && oldFields != null ) {
 					}
 				}
 			}
-
 		}
 
 		if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) {

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractPropertyMapping.java

@@ -115,7 +115,7 @@ public String[] toColumns(String propertyName) throws QueryException {
 		String[] result = new String[columns.length];
 		for ( int i = 0; i < columns.length; i++ ) {
 			if ( columnReaders[i] == null ) {
-				result[i] = StringHelper.replace( formulaTemplates[i], Template.TEMPLATE, "" );
+				result[i] = StringHelper.replace( formulaTemplates[i], Template.TEMPLATE + ".", "" );
 			}
 			else {
 				result[i] = columnReaders[i];

hibernate-core/src/main/java/org/hibernate/persister/entity/Queryable.java

@@ -138,6 +138,8 @@ public interface Queryable extends Loadable, PropertyMapping, Joinable {
 
 	String[][] getSubclassPropertyFormulaTemplateClosure();
 
+	String[][] getSubclassPropertyColumnNameClosure();
+
 	public static class Declarer {
 		public static final Declarer CLASS = new Declarer( "class" );
 		public static final Declarer SUBCLASS = new Declarer( "subclass" );

hibernate-core/src/test/java/org/hibernate/test/formulajoin/AssociationFormulaTest.java

@@ -10,6 +10,7 @@
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -27,11 +28,6 @@ public AssociationFormulaTest() {
 		super();
 	}
 
-	@Override
-	protected boolean isCleanupTestDataRequired() {
-		return true;
-	}
-
 	@Override
 	protected boolean rebuildSessionFactoryOnError() {
 		return true;
@@ -61,6 +57,16 @@ public void fillDb() {
 		);
 	}
 
+	@After
+	public void tearDown() {
+		inTransaction(
+				session -> {
+					session.createQuery( "delete from Entity" ).executeUpdate();
+					session.createQuery( "delete from OtherEntity" ).executeUpdate();
+				}
+		);
+	}
+
 	@Test
 	public void testJoin() {
 
@@ -219,21 +225,6 @@ public void testDeleteHql() {
 		);
 	}
 
-	@Test
-	public void testDeleteHqlNull() {
-		inTransaction(
-				session -> {
-					assertEquals(
-							"execute",
-							1,
-							session.createQuery( "delete Entity e where e.other is null" ).executeUpdate()
-					);
-					Entity loaded = (Entity) session.createQuery( "from Entity e where e.id.id = 3" ).uniqueResult();
-					assertNull( "loaded", loaded );
-				}
-		);
-	}
-
 	@Test
 	public void testPersist() {
 		inTransaction(