Merge pull request #356 from rjperes/NH-3720

NH-3720

Author: hazzik

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

@@ -28,6 +28,20 @@ protected override void OnSetUp()
 					         };
 				session.Save(e2);
 
+				var e3 = new Entity
+				{
+					Name = "True",
+					Age = "10"
+				};
+				session.Save(e3);
+
+				var e4 = new Entity
+				{
+					Name = "20141013",
+					Age = "11"
+				};
+				session.Save(e4);
+
 				session.Flush();
 				transaction.Commit();
 			}
@@ -71,5 +85,31 @@ public void ShouldBeAbleToCallConvertToInt32FromStringParameterInMax()
 				Assert.AreEqual(17, result);
 			}
 		}
+
+		[Test]
+		public void ShouldBeAbleToCallConvertToBooleanFromStringParameter()
+		{
+			//NH-3720
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = session.Query<Entity>().Where(x => x.Name == Boolean.TrueString).Select(x => Convert.ToBoolean(x.Name)).Single();
+
+				Assert.AreEqual(true, result);
+			}
+		}
+
+		[Test]
+		public void ShouldBeAbleToCallConvertToDateTimeFromStringParameter()
+		{
+			//NH-3720
+			using (ISession session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				var result = session.Query<Entity>().Where(x => x.Name == "20141013").Select(x => Convert.ToDateTime(x.Name)).Single();
+
+				Assert.AreEqual(new DateTime(2014, 10, 13), result);
+			}
+		}
 	}
 }

src/NHibernate/Linq/Functions/ConvertGenerator.cs

@@ -10,7 +10,42 @@
 
 namespace NHibernate.Linq.Functions
 {
-	public class ConvertToInt32Generator : BaseHqlGeneratorForMethod
+	public abstract class ConvertToGenerator<T> : BaseHqlGeneratorForMethod
+	{
+		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
+		{
+			return treeBuilder.Cast(visitor.Visit(arguments[0]).AsExpression(), typeof(T));
+		}
+	}
+
+	//NH-3720
+	public class ConvertToDateTimeGenerator : ConvertToGenerator<DateTime>
+	{
+		public ConvertToDateTimeGenerator()
+		{
+			SupportedMethods = new[]
+								   {
+									   ReflectionHelper.GetMethodDefinition<string>(s => DateTime.Parse(s)),
+									   ReflectionHelper.GetMethodDefinition<string>(o => Convert.ToDateTime(o))
+								   };
+		}
+	}
+
+	//NH-3720
+	public class ConvertToBooleanGenerator : ConvertToGenerator<Boolean>
+	{
+		public ConvertToBooleanGenerator()
+		{
+			SupportedMethods = new[]
+								   {
+									   ReflectionHelper.GetMethodDefinition<string>(s => Boolean.Parse(s)),
+									   ReflectionHelper.GetMethodDefinition<string>(o => Convert.ToBoolean(o))
+								   };
+		}
+	}
+
+
+	public class ConvertToInt32Generator : ConvertToGenerator<int>
 	{
 		public ConvertToInt32Generator()
 		{
@@ -34,14 +69,9 @@ public ConvertToInt32Generator()
 									   ReflectionHelper.GetMethodDefinition<ushort>(o => Convert.ToInt32(o))
 								   };
 		}
-
-		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
-		{
-			return treeBuilder.Cast(visitor.Visit(arguments[0]).AsExpression(), typeof (int));
-		}
 	}
 
-	public class ConvertToDecimalGenerator : BaseHqlGeneratorForMethod
+	public class ConvertToDecimalGenerator : ConvertToGenerator<decimal>
 	{
 		public ConvertToDecimalGenerator()
 		{
@@ -64,14 +94,9 @@ public ConvertToDecimalGenerator()
 									   ReflectionHelper.GetMethodDefinition<ushort>(o => Convert.ToDecimal(o))
 								   };
 		}
-
-		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
-		{
-			return treeBuilder.Cast(visitor.Visit(arguments[0]).AsExpression(), typeof(decimal));
-		}
 	}
 
-	public class ConvertToDoubleGenerator : BaseHqlGeneratorForMethod
+	public class ConvertToDoubleGenerator : ConvertToGenerator<double>
 	{
 		public ConvertToDoubleGenerator()
 		{
@@ -94,10 +119,5 @@ public ConvertToDoubleGenerator()
 									   ReflectionHelper.GetMethodDefinition<ushort>(o => Convert.ToDouble(o))
 								   };
 		}
-
-		public override HqlTreeNode BuildHql(MethodInfo method, Expression targetObject, ReadOnlyCollection<Expression> arguments, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
-		{
-			return treeBuilder.Cast(visitor.Visit(arguments[0]).AsExpression(), typeof(double));
-		}
 	}
 }

src/NHibernate/Linq/Functions/DefaultLinqToHqlGeneratorsRegistry.cs

@@ -25,6 +25,9 @@ public DefaultLinqToHqlGeneratorsRegistry()
 			RegisterGenerator(new CompareGenerator());
 			this.Merge(new CompareGenerator());
 
+			//NH-3720
+			this.Merge(new ConvertToDateTimeGenerator());
+			this.Merge(new ConvertToBooleanGenerator());
 			this.Merge(new ConvertToInt32Generator());
 			this.Merge(new ConvertToDecimalGenerator());
 			this.Merge(new ConvertToDoubleGenerator());