NH-3795 - Use Regex to identify compiler generated members in FindMemberExpression

Author: hazzik

src/NHibernate.Test/NHSpecificTest/NH3795/Fixture.cs

@@ -12,18 +12,14 @@ public class Fixture : TestCase
 	{
 		protected Child childAliasField = null;
 		protected A aAliasField = null;
-		
+
 		protected override IList Mappings
 		{
-			get
-			{
-				return new[] { "ParentChild.hbm.xml", "ABC.hbm.xml" };
-			}
+			get { return new[] {"ParentChild.hbm.xml", "ABC.hbm.xml"}; }
 		}
-		
-		
+
 		[Test]
-		public void TestAliasInQueryOver()
+		public void TestFieldAliasInQueryOver()
 		{
 			using (var s = sessions.OpenSession())
 			{
@@ -34,9 +30,9 @@ public void TestAliasInQueryOver()
 					.List();
 			}
 		}
-		
+
 		[Test]
-		public void TestAliasInQueryOverWithConversion()
+		public void TestFieldAliasInQueryOverWithConversion()
 		{
 			using (var s = sessions.OpenSession())
 			{
@@ -47,9 +43,9 @@ public void TestAliasInQueryOverWithConversion()
 					.List();
 			}
 		}
-		
+
 		[Test]
-		public void TestAliasInJoinAlias()
+		public void TestFieldAliasInJoinAlias()
 		{
 			using (var s = sessions.OpenSession())
 			{
@@ -61,9 +57,9 @@ public void TestAliasInJoinAlias()
 					.List();
 			}
 		}
-		
+
 		[Test]
-		public void TestAliasInJoinQueryOver()
+		public void TestFieldAliasInJoinQueryOver()
 		{
 			using (var s = sessions.OpenSession())
 			{
@@ -75,5 +71,67 @@ public void TestAliasInJoinQueryOver()
 				.List();
 			}
 		}
+
+		[Test]
+		public void TestAliasInQueryOver()
+		{
+			Child childAlias = null;
+			A aAlias = null;
+			using (var s = sessions.OpenSession())
+			{
+				A rowalias = null;
+				s.QueryOver(() => aAlias)
+					.SelectList(list => list
+						.Select(() => aAlias.Id).WithAlias(() => rowalias.Id))
+					.List();
+			}
+		}
+
+		[Test]
+		public void TestAliasInQueryOverWithConversion()
+		{
+			Child childAlias = null;
+			A aAlias = null;
+			using (var s = sessions.OpenSession())
+			{
+				B rowalias = null;
+				s.QueryOver(() => aAlias)
+					.SelectList(list => list
+						.Select(() => ((B) aAlias).Count).WithAlias(() => rowalias.Count))
+					.List();
+			}
+		}
+
+		[Test]
+		public void TestAliasInJoinAlias()
+		{
+			Child childAlias = null;
+			A aAlias = null;
+			using (var s = sessions.OpenSession())
+			{
+				Child rowalias = null;
+				s.QueryOver<Parent>()
+					.JoinAlias(p => p.Child, () => childAlias)
+					.SelectList(list => list
+						.Select(() => childAlias.Id).WithAlias(() => rowalias.Id))
+					.List();
+			}
+		}
+
+		[Test]
+		public void TestAliasInJoinQueryOver()
+		{
+			Child childAlias = null;
+			A aAlias = null;
+			using (var s = sessions.OpenSession())
+			{
+				Child rowalias = null;
+				s.QueryOver<Parent>()
+					.JoinQueryOver(p => p.Child, () => childAlias)
+					.SelectList(list => list
+						.Select(() => childAlias.Id).WithAlias(() => rowalias.Id))
+					.List();
+			}
+		}
 	}
 }

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -5,6 +5,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Text.RegularExpressions;
 using NHibernate.Criterion;
 using NHibernate.Util;
 using Expression = System.Linq.Expressions.Expression;
@@ -290,13 +291,16 @@ public static ProjectionInfo FindMemberProjection(Expression expression)
 			return ProjectionInfo.ForProperty(FindMemberExpression(expression));
 		}
 
+		//http://stackoverflow.com/a/2509524/259946
+		private static readonly Regex GeneratedMemberNameRegex = new Regex(@"^(CS\$)?<\w*>[1-9a-s]__[a-zA-Z]+[0-9]*$", RegexOptions.Compiled | RegexOptions.Singleline);
+
 		private static bool IsCompilerGeneratedMemberExpressionOfCompilerGeneratedClass(Expression expression)
 		{
 			var memberExpression = expression as MemberExpression;
 			if (memberExpression != null && memberExpression.Member.DeclaringType != null)
 			{
 				return Attribute.GetCustomAttribute(memberExpression.Member.DeclaringType, typeof(CompilerGeneratedAttribute)) != null 
-					&& memberExpression.Member.Name.StartsWith("<"); // Is there another way to check for a compiler generated member?
+					&& GeneratedMemberNameRegex.IsMatch(memberExpression.Member.Name);
 			}
 
 			return false;