Merge pull request #365 from LordJZ/patch-1

oskarb · oskarb · commit 6823bc4cbd53 · 2014-10-22T21:32:23.000+02:00
Fixed PropertyExpression.ToString when RHS is a projection
diff --git a/src/NHibernate/Criterion/PropertyExpression.cs b/src/NHibernate/Criterion/PropertyExpression.cs
@@ -124,7 +124,7 @@ public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery c
 		/// <summary></summary>
 		public override string ToString()
 		{
-			return (_lhsProjection ?? (object)_lhsPropertyName) + Op + _rhsPropertyName;
+			return (_lhsProjection ?? (object)_lhsPropertyName) + Op + (_rhsProjection ?? (object)_rhsPropertyName);
 		}
 
 		public override IProjection[] GetProjections()

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public override TypedValue[] GetTypedValues(ICriteria criteria, ICriteriaQuery c`
`124`	`124`	`/// <summary></summary>`
`125`	`125`	`public override string ToString()`
`126`	`126`	`{`
`127`		`- return (_lhsProjection ?? (object)_lhsPropertyName) + Op + _rhsPropertyName;`
	`127`	`+ return (_lhsProjection ?? (object)_lhsPropertyName) + Op + (_rhsProjection ?? (object)_rhsPropertyName);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public override IProjection[] GetProjections()`