Linq - add generators for DateTimeOffset properties (NH-3209)

Author: hazzik

src/NHibernate/Linq/Functions/DateTimePropertiesHqlGenerator.cs

@@ -7,36 +7,34 @@
 
 namespace NHibernate.Linq.Functions
 {
-	public class DateTimePropertiesHqlGenerator : IHqlGeneratorForProperty
+	public class DateTimePropertiesHqlGenerator : BaseHqlGeneratorForProperty
 	{
-		private readonly MemberInfo[] supportedProperties;
-
 		public DateTimePropertiesHqlGenerator()
 		{
-			supportedProperties = new[]
-			                      	{
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Year),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Month),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Day),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Hour),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Minute),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Second),
-			                      		ReflectionHelper.GetProperty((DateTime x) => x.Date),
-			                      	};
-		}
-
-		public IEnumerable<MemberInfo> SupportedProperties
-		{
-			get
-			{
-				return supportedProperties;
-			}
+			SupportedProperties = new[]
+				{
+					ReflectionHelper.GetProperty((DateTime x) => x.Year),
+					ReflectionHelper.GetProperty((DateTime x) => x.Month),
+					ReflectionHelper.GetProperty((DateTime x) => x.Day),
+					ReflectionHelper.GetProperty((DateTime x) => x.Hour),
+					ReflectionHelper.GetProperty((DateTime x) => x.Minute),
+					ReflectionHelper.GetProperty((DateTime x) => x.Second),
+					ReflectionHelper.GetProperty((DateTime x) => x.Date),
+					
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Year),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Month),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Day),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Hour),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Minute),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Second),
+					ReflectionHelper.GetProperty((DateTimeOffset x) => x.Date),
+				};
 		}
 
-		public virtual HqlTreeNode BuildHql(MemberInfo member, Expression expression, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
+		public override HqlTreeNode BuildHql(MemberInfo member, Expression expression, HqlTreeBuilder treeBuilder, IHqlExpressionVisitor visitor)
 		{
 			return treeBuilder.MethodCall(member.Name.ToLowerInvariant(),
-			                              visitor.Visit(expression).AsExpression());
+										  visitor.Visit(expression).AsExpression());
 		}
 	}
 }

src/NHibernate/Linq/Functions/LinqToHqlGeneratorsRegistryExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 
 namespace NHibernate.Linq.Functions
 {
@@ -15,7 +14,10 @@ public static void Merge(this ILinqToHqlGeneratorsRegistry registry, IHqlGenerat
 			{
 				throw new ArgumentNullException("generator");
 			}
-			Array.ForEach(generator.SupportedMethods.ToArray(), method=> registry.RegisterGenerator(method, generator));
+			foreach (var method in generator.SupportedMethods)
+			{
+				registry.RegisterGenerator(method, generator);
+			}
 		}
 
 		public static void Merge(this ILinqToHqlGeneratorsRegistry registry, IHqlGeneratorForProperty generator)
@@ -28,7 +30,10 @@ public static void Merge(this ILinqToHqlGeneratorsRegistry registry, IHqlGenerat
 			{
 				throw new ArgumentNullException("generator");
 			}
-			Array.ForEach(generator.SupportedProperties.ToArray(), property => registry.RegisterGenerator(property, generator));
+			foreach (var property in generator.SupportedProperties)
+			{
+				registry.RegisterGenerator(property, generator);
+			}
 		}
 	}
 }