Fix and use GetIdentifierPropertyType

Author: maca88

src/NHibernate/Linq/Visitors/SelectClauseNominator.cs

@@ -180,8 +180,8 @@ private bool CanBeEvaluatedInHql(MemberExpression memberExpression)
 			}
 
 			var persister = _parameters.SessionFactory.GetEntityPersister(entityName);
-			var index = persister.EntityMetamodel.GetPropertyIndexOrNull(memberPath);
-			return index.HasValue || IsIdentifierMember(persister, memberPath);
+			return persister.EntityMetamodel.GetIdentifierPropertyType(memberPath) != null ||
+					persister.EntityMetamodel.GetPropertyIndexOrNull(memberPath).HasValue;
 		}
 
 		private bool CanBeEvaluatedInHql(ConditionalExpression conditionalExpression)
@@ -322,17 +322,5 @@ private static bool ContainsAnyOfTypes(IEnumerable<Expression> expressions, para
 		{
 			return expressions.Any(o => types.Contains(o.Type));
 		}
-
-		private static bool IsIdentifierMember(IEntityPersister entityPersister, string memberPath)
-		{
-			var idName = entityPersister.IdentifierPropertyName;
-			// Composite key
-			if (entityPersister.IdentifierType is IAbstractComponentType idComponentType)
-			{
-				return idComponentType.PropertyNames.Any(o => (string.IsNullOrEmpty(idName) ? o : $"{idName}.{o}") == memberPath);
-			}
-
-			return idName == memberPath;
-		}
 	}
 }

src/NHibernate/Tuple/Entity/EntityMetamodel.cs

@@ -94,6 +94,7 @@ public EntityMetamodel(PersistentClass persistentClass, ISessionFactoryImplement
 
 			identifierProperty = PropertyFactory.BuildIdentifierProperty(persistentClass,
 			                                                             sessionFactory.GetIdentifierGenerator(rootName));
+			MapIdentifierPropertyTypes(identifierProperty);
 
 			versioned = persistentClass.IsVersioned;