Fix NH-2172 (Unrecognised method call in expression when using QueryOver queries in VB.Net) - updated fix to handle property comparisons

SVN: trunk@5422

Author: FlukeFan

src/NHibernate.Test/Criteria/Lambda/QueryOverFixture.cs

@@ -51,7 +51,7 @@ public static int CompareString(string left, string right, bool textCompare)
 		}
 
 		[Test]
-		public void StringEqualityInVisualBasic()
+		public void VisualBasicStringComparison()
 		{
 			ICriteria expected =
 				CreateTestCriteria(typeof(Person))
@@ -60,7 +60,13 @@ public void StringEqualityInVisualBasic()
 					.Add(Restrictions.Gt("Name", "test name"))
 					.Add(Restrictions.Ge("Name", "test name"))
 					.Add(Restrictions.Lt("Name", "test name"))
-					.Add(Restrictions.Le("Name", "test name"));
+					.Add(Restrictions.Le("Name", "test name"))
+					.Add(Restrictions.EqProperty("Name", "Name"))
+					.Add(Restrictions.Not(Restrictions.EqProperty("Name", "Name")))
+					.Add(Restrictions.GtProperty("Name", "Name"))
+					.Add(Restrictions.GeProperty("Name", "Name"))
+					.Add(Restrictions.LtProperty("Name", "Name"))
+					.Add(Restrictions.LeProperty("Name", "Name"));
 
 			IQueryOver<Person> actual =
 				CreateTestQueryOver<Person>()
@@ -69,7 +75,13 @@ public void StringEqualityInVisualBasic()
 					.And(p => CompareString(p.Name, "test name", true) > 0)
 					.And(p => CompareString(p.Name, "test name", true) >= 0)
 					.And(p => CompareString(p.Name, "test name", true) < 0)
-					.And(p => CompareString(p.Name, "test name", true) <= 0);
+					.And(p => CompareString(p.Name, "test name", true) <= 0)
+					.And(p => CompareString(p.Name, p.Name, true) == 0)
+					.And(p => CompareString(p.Name, p.Name, true) != 0)
+					.And(p => CompareString(p.Name, p.Name, true) > 0)
+					.And(p => CompareString(p.Name, p.Name, true) >= 0)
+					.And(p => CompareString(p.Name, p.Name, true) < 0)
+					.And(p => CompareString(p.Name, p.Name, true) <= 0);
 
 			AssertCriteriaAreEqual(expected, actual);
 		}

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -318,7 +318,7 @@ private static ICriterion ProcessSimpleExpression(BinaryExpression be)
 			return ProcessSimpleExpression(be.Left, be.Right, be.NodeType);
 		}
 
-		public static ICriterion ProcessSimpleExpression(Expression left, Expression right, ExpressionType nodeType)
+		private static ICriterion ProcessSimpleExpression(Expression left, Expression right, ExpressionType nodeType)
 		{
 			string property = FindMemberExpression(left);
 			System.Type propertyType = FindMemberType(left);
@@ -340,7 +340,11 @@ public static ICriterion ProcessSimpleExpression(Expression left, Expression rig
 		private static ICriterion ProcessVisualBasicStringComparison(BinaryExpression be)
 		{
 			var methodCall = (MethodCallExpression)be.Left;
-			return ProcessSimpleExpression(methodCall.Arguments[0], methodCall.Arguments[1], be.NodeType);
+
+			if (IsMemberExpression(methodCall.Arguments[1]))
+				return ProcessMemberExpression(methodCall.Arguments[0], methodCall.Arguments[1], be.NodeType);
+			else
+				return ProcessSimpleExpression(methodCall.Arguments[0], methodCall.Arguments[1], be.NodeType);
 		}
 
 		private static ICriterion ProcessSimpleNullExpression(string property, ExpressionType expressionType)
@@ -357,13 +361,18 @@ private static ICriterion ProcessSimpleNullExpression(string property, Expressio
 
 		private static ICriterion ProcessMemberExpression(BinaryExpression be)
 		{
-			string leftProperty = FindMemberExpression(be.Left);
-			string rightProperty = FindMemberExpression(be.Right);
+			return ProcessMemberExpression(be.Left, be.Right, be.NodeType);
+		}
+
+		private static ICriterion ProcessMemberExpression(Expression left, Expression right, ExpressionType nodeType)
+		{
+			string leftProperty = FindMemberExpression(left);
+			string rightProperty = FindMemberExpression(right);
 
-			if (!_propertyExpressionCreators.ContainsKey(be.NodeType))
-				throw new Exception("Unhandled property expression type: " + be.NodeType);
+			if (!_propertyExpressionCreators.ContainsKey(nodeType))
+				throw new Exception("Unhandled property expression type: " + nodeType);
 
-			Func<string, string, ICriterion> propertyExpressionCreator = _propertyExpressionCreators[be.NodeType];
+			Func<string, string, ICriterion> propertyExpressionCreator = _propertyExpressionCreators[nodeType];
 			ICriterion criterion = propertyExpressionCreator(leftProperty, rightProperty);
 			return criterion;
 		}