#16 Querying on a subset of a composite-id fixed

Partly a port from Hibernate's HHH-8567

Author: RogerKratz

Src/NHibernate.Envers.Tests/Integration/Query/SimpleQueryTest.cs

@@ -4,6 +4,7 @@
 using NHibernate.Criterion;
 using NHibernate.Envers.Query;
 using NHibernate.Envers.Tests.Entities;
+using NHibernate.Envers.Tests.Entities.Ids;
 using NUnit.Framework;
 using SharpTestsEx;
 
@@ -14,25 +15,22 @@ public class SimpleQueryTest : TestBase
 		private int id1;
 		private int id2;
 		private int id3;
+		private EmbId embId;
 
 		public SimpleQueryTest(AuditStrategyForTest strategyType) : base(strategyType)
 		{
 		}
 
-		protected override IEnumerable<string> Mappings
-		{
-			get
-			{
-				return new[] { "Entities.Mapping.hbm.xml" };
-			}
-		}
+		protected override IEnumerable<string> Mappings =>
+			new[] {"Entities.Mapping.hbm.xml", "Entities.Ids.Mapping.hbm.xml"};
 
 		protected override void Initialize()
 		{
 			var site1 = new StrIntTestEntity { Str = "a", Number = 10 };
 			var site2 = new StrIntTestEntity { Str = "a", Number = 10 };
 			var site3 = new StrIntTestEntity { Str = "b", Number = 5 };
-
+			embId = new EmbId{X = 3, Y = 4};
+			
 			using (var tx = Session.BeginTransaction())
 			{
 				id1 = (int) Session.Save(site1);
@@ -42,6 +40,7 @@ protected override void Initialize()
 			}
 			using (var tx = Session.BeginTransaction())
 			{
+				Session.Save(new EmbIdTestEntity{Id = embId, Str1 = "something"});
 				site1.Str = "aBc";
 				site2.Number = 20;
 				tx.Commit();
@@ -374,5 +373,27 @@ public void VerifyInsensitiveLikeWithMatchMode()
 									 .Single()
 									 .Should().Be.EqualTo(site1);
 		}
+
+		[Test]
+		public void VerifyIdPropertyRestriction()
+		{
+			var ver2 = AuditReader().CreateQuery()
+				.ForEntitiesAtRevision<StrIntTestEntity>(2)
+				.Add(AuditEntity.Property("Id").Eq(id2))
+				.Single();
+			ver2.Number.Should().Be.EqualTo(20);
+			ver2.Str.Should().Be.EqualTo("a");
+		}
+
+		[Test]
+		public void VerifyEmbeddedIdPropertyRestriction()
+		{
+			var ver2 = AuditReader().CreateQuery()
+				.ForEntitiesAtRevision<EmbIdTestEntity>(2)
+				.Add(AuditEntity.Property("Id.X").Eq(embId.X))
+				.Add(AuditEntity.Property("Id.Y").Eq(embId.Y))
+				.Single();
+			ver2.Str1.Should().Be.EqualTo("something");
+		}
 	}
 }

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

@@ -46,12 +46,23 @@ 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))
 			{
-				var identifierPropertyName =
-					versionsReader.SessionImplementor.Factory.GetEntityPersister(entityName).IdentifierPropertyName;
-				propertyName = auditCfg.AuditEntCfg.OriginalIdPropName + "." + identifierPropertyName;
+				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 + "_"))
+			{
+				return auditCfg.AuditEntCfg.OriginalIdPropName + "." + propertyName.Substring(idPropertyName.Length + 1);
+			}
+
 			return propertyName;
 		}
 	}