#16 fully fixed. Now ComponentAsIdGetAudit green.

Author: RogerKratz

Src/NHibernate.Envers/Configuration/Metadata/AuditMetadataGenerator.cs

@@ -493,6 +493,8 @@ public void GenerateSecondPass(PersistentClass pc, ClassAuditingData auditingDat
 			// Mapping unjoined properties
 			var parent = xmlMappingData.ClassMapping;
 
+			idMetadataGenerator.GenerateSecondPass(entityName, pc);
+
 			addProperties(parent, pc.UnjoinedPropertyIterator,
 					propertyMapper, auditingData, entityName, xmlMappingData, false);
 

Src/NHibernate.Envers/Configuration/Metadata/IdMetadataGenerator.cs

@@ -113,5 +113,37 @@ private static PropertyAuditingData getIdPersistentPropertyAuditingData(Property
 		{
 			return new PropertyAuditingData(property.Name, property.PropertyAccessorName);
 		}
+
+		public void GenerateSecondPass(string entityName, PersistentClass persistentClass)
+		{
+			var identifierMapper = persistentClass.IdentifierMapper;
+			var identifierProperty = persistentClass.IdentifierProperty;
+			if (identifierMapper != null)
+			{
+				generateSecondPass(entityName, identifierMapper);
+			}
+			else if (identifierProperty != null && identifierProperty.IsComposite)
+			{
+				var component = (Component)identifierProperty.Value;
+				generateSecondPass(entityName, component);
+			}
+		}
+
+		private void generateSecondPass(string entityName, Component component)
+		{
+			foreach (var property in component.PropertyIterator)
+			{
+				if (property.Value is ToOne toOneValue)
+				{
+					var propertyData = getIdPersistentPropertyAuditingData(property);
+					var referencedEntityName = toOneValue.ReferencedEntityName;
+					var prefix = _mainGenerator.VerEntCfg.OriginalIdPropName + "." + propertyData.Name;
+					var relMapper = _mainGenerator.EntitiesConfigurations[referencedEntityName].IdMapper;
+					var prefixedMapper = relMapper.PrefixMappedProperties(prefix + ".");
+					
+					_mainGenerator.EntitiesConfigurations[entityName].AddToOneRelation(prefix, referencedEntityName, prefixedMapper, true, false);
+				}	
+			}
+		}
 	}
 }

Src/NHibernate.Envers/Query/Criteria/CriteriaTools.cs

@@ -47,21 +47,25 @@ public static string DeterminePropertyName(AuditConfiguration auditCfg, IAuditRe
 		public static string DeterminePropertyName(AuditConfiguration auditCfg, IAuditReaderImplementor versionsReader,
 		                                           string entityName, string propertyName)
 		{
-			var sessionFactory = versionsReader.SessionImplementor.Factory;
-			if (AuditId.IdentifierPlaceholder.Equals(propertyName))
+			if (propertyName != null)
 			{
-				var identifierPropertyName = sessionFactory.GetEntityPersister(entityName).IdentifierPropertyName;
-				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + identifierPropertyName;
-			}
+				var sessionFactory = versionsReader.SessionImplementor.Factory;
+				if (AuditId.IdentifierPlaceholder.Equals(propertyName))
+				{
+					var identifierPropertyName = sessionFactory.GetEntityPersister(entityName).IdentifierPropertyName;
+					return auditCfg.AuditEntCfg.OriginalIdPropName + "." + identifierPropertyName;
+				}
 
-			var idPropertyName = sessionFactory.GetEntityPersister(entityName).IdentifierPropertyName;
-			if (propertyName.Equals(idPropertyName))
-			{
-				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName;
-			}
-			if (propertyName.StartsWith(idPropertyName + MappingTools.RelationCharacter))
-			{
-				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName.Substring(idPropertyName.Length + 1);
+				var idPropertyName = sessionFactory.GetEntityPersister(entityName).IdentifierPropertyName;
+				if (propertyName.Equals(idPropertyName))
+				{
+					return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName;
+				}
+				if (propertyName.StartsWith(idPropertyName + MappingTools.RelationCharacter))
+				{
+					propertyName = propertyName.Replace(MappingTools.RelationCharacter, ".");
+					return auditCfg.AuditEntCfg.OriginalIdPropName + propertyName.Substring(idPropertyName.Length);
+				}
 			}
 
 			return propertyName;