Merge pull request #160 from tgmayfield/NH-3293

NH-3293 - Expand what gets ToString() called on it in SimpleExpression.ToString()

Author: oskarb

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

@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 using NHibernate.Criterion;
 
 namespace NHibernate.Test.NHSpecificTest.NH2982
@@ -65,5 +66,29 @@ public void SimpleExpressionWithPrimitive()
 			var restriction = Restrictions.Eq("A", 5);
 			Assert.AreEqual("A = 5", restriction.ToString());
 		}
+
+		[Test]
+		public void SimpleExpressionWithNullablePrimitive()
+		{
+			int? value = null;
+			value = 5;
+			var restriction = Restrictions.Eq("A", value);
+			Assert.AreEqual("A = 5", restriction.ToString());
+		}
+
+		[Test]
+		public void SimpleExpressionWithString()
+		{
+			var restriction = Restrictions.Like("A", "Test");
+			Assert.AreEqual("A like Test", restriction.ToString());
+		}
+
+		[Test]
+		public void SimpleExpressionWithNullableDate()
+		{
+			DateTime? date = new DateTime(2012, 1, 1);
+			var restriction = Restrictions.Eq("A", date);
+			Assert.AreEqual("A = " + date, restriction.ToString());
+		}
 	}
 }

src/NHibernate/Criterion/SimpleExpression.cs

@@ -173,12 +173,24 @@ protected virtual string Op
 			get { return op; }
 		}
 
-		string ValueToStrings()
+		private static readonly System.Type[] CallToStringTypes = new[]
 		{
-			if(value!=null && value.GetType().IsPrimitive)
+			typeof(DateTime),
+			typeof(string),
+		};
+
+		private string ValueToStrings()
+		{
+			if (value == null)
+			{
+				return "null";
+			}
+			var type = value.GetType();
+			if (type.IsPrimitive || CallToStringTypes.Any(t => t.IsAssignableFrom(type)))
 			{
 				return value.ToString();
 			}
+
 			return ObjectHelpers.IdentityToString(value);
 		}
 	}