Hacky solution to make count(e) work again

(It wasn't working on the new 6 branch)

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstWalker.java

@@ -17,6 +17,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
 import org.hibernate.internal.util.collections.StandardStack;
 import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.persister.entity.Loadable;
 import org.hibernate.query.QueryLiteralRendering;
 import org.hibernate.query.UnaryArithmeticOperator;
 import org.hibernate.query.sqm.tree.expression.Conversion;
@@ -418,6 +419,10 @@ public abstract class AbstractSqlAstWalker
 		// TableGroup and TableGroup handling should be performed as part of `#visitFromClause`...
 
 		// todo (6.0) : what is the correct behavior here?
+		appendSql( tableGroup.getPrimaryTableReference().getIdentificationVariable() );
+		appendSql( '.' );
+		//TODO: pretty sure the typecast to Loadable is quite wrong here
+		appendSql( ( (Loadable) tableGroup.getModelPart() ).getIdentifierColumnNames()[0] );
 	}
 
 	@Override
@@ -425,6 +430,10 @@ public abstract class AbstractSqlAstWalker
 		// TableGroup and TableGroupJoin handling should be performed as part of `#visitFromClause`...
 
 		// todo (6.0) : what is the correct behavior here?
+		appendSql( tableGroupJoin.getJoinedGroup().getPrimaryTableReference().getIdentificationVariable() );
+		appendSql( '.' );
+		//TODO: pretty sure the typecast to Loadable is quite wrong here
+		appendSql( ( (Loadable) tableGroupJoin.getJoinedGroup().getModelPart() ).getIdentifierColumnNames()[0] );
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java

@@ -855,7 +855,6 @@ public class StandardFunctionTests {
 	}
 
 	@Test
-	@FailureExpected
 	public void testCountFunction(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {