NH-3684 - Remove obsolete <Time>Part extension methods of QueryOver

Author: hazzik

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

@@ -8,15 +8,9 @@ namespace NHibernate.Test.Criteria.Lambda
 	[TestFixture]
 	public class FunctionsIntegrationFixture : TestCase
 	{
-		protected override string MappingsAssembly
-		{
-			get { return "NHibernate.Test"; }
-		}
+		protected override string MappingsAssembly => "NHibernate.Test";
 
-		protected override IList Mappings
-		{
-			get { return new[] { "Criteria.Lambda.Mappings.hbm.xml" }; }
-		}
+		protected override IList Mappings => new[] { "Criteria.Lambda.Mappings.hbm.xml" };
 
 		protected override void OnTearDown()
 		{
@@ -41,69 +35,6 @@ protected override void OnSetUp()
 			}
 		}
 
-		[Test]
-		public void YearPartEqual()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var persons = s.QueryOver<Person>()
-					.Where(p => p.BirthDate.YearPart() == 2008)
-					.List();
-
-				Assert.That(persons.Count, Is.EqualTo(1));
-				Assert.That(persons[0].Name, Is.EqualTo("p2"));
-			}
-		}
-
-		[Test]
-		public void YearPartIsIn()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var persons = s.QueryOver<Person>()
-					.Where(p => p.BirthDate.YearPart().IsIn(new[] { 2008, 2009 }))
-					.OrderBy(p => p.Name).Asc
-					.List();
-
-				Assert.That(persons.Count, Is.EqualTo(2));
-				Assert.That(persons[0].Name, Is.EqualTo("p1"));
-				Assert.That(persons[1].Name, Is.EqualTo("p2"));
-			}
-		}
-
-		[Test]
-		public void YearPartSingleOrDefault()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var yearOfBirth = s.QueryOver<Person>()
-					.Where(p => p.Name == "p2")
-					.Select(p => p.BirthDate.YearPart())
-					.SingleOrDefault<object>();
-
-				Assert.That(yearOfBirth.GetType(), Is.EqualTo(typeof (int)));
-				Assert.That(yearOfBirth, Is.EqualTo(2008));
-			}
-		}
-
-		[Test]
-		public void SelectAvgYearPart()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var avgYear = s.QueryOver<Person>()
-					.SelectList(list => list.SelectAvg(p => p.BirthDate.YearPart()))
-					.SingleOrDefault<object>();
-
-				Assert.That(avgYear.GetType(), Is.EqualTo(typeof (double)));
-				Assert.That(string.Format("{0:0}", avgYear), Is.EqualTo("2008"));
-			}
-		}
-
 		[Test]
 		public void SqrtSingleOrDefault()
 		{
@@ -216,38 +147,6 @@ public void Concat()
 			}
 		}
 
-		[Test]
-		public void MonthPartEqualsDayPart()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var persons = s.QueryOver<Person>()
-					.Where(p => p.BirthDate.MonthPart() == p.BirthDate.DayPart())
-					.List();
-
-				Assert.That(persons.Count, Is.EqualTo(1));
-				Assert.That(persons[0].Name, Is.EqualTo("p2"));
-			}
-		}
-
-		[Test]
-		public void OrderByYearPart()
-		{
-			using (var s = OpenSession())
-			using (s.BeginTransaction())
-			{
-				var persons = s.QueryOver<Person>()
-					.OrderBy(p => p.BirthDate.YearPart()).Desc
-					.List();
-
-				Assert.That(persons.Count, Is.EqualTo(3));
-				Assert.That(persons[0].Name, Is.EqualTo("p1"));
-				Assert.That(persons[1].Name, Is.EqualTo("p2"));
-				Assert.That(persons[2].Name, Is.EqualTo("pP3"));
-			}
-		}
-
 		[Test]
 		public void YearEqual()
 		{

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

@@ -754,21 +754,6 @@ public void OrderBy()
 			AssertCriteriaAreEqual(expected, actual);
 		}
 
-		[Test]
-		public void OrderByYearPartFunction()
-		{
-			ICriteria expected =
-				CreateTestCriteria(typeof(Person), "personAlias")
-					.AddOrder(Order.Desc(Projections.SqlFunction("year", NHibernateUtil.Int32, Projections.Property("personAlias.BirthDate"))));
-
-			Person personAlias = null;
-			IQueryOver<Person> actual =
-				CreateTestQueryOver<Person>(() => personAlias)
-					.OrderBy(() => personAlias.BirthDate.YearPart()).Desc;
-
-			AssertCriteriaAreEqual(expected, actual);
-		}
-
 		[Test]
 		public void OrderByYearFunction()
 		{

src/NHibernate/Criterion/ProjectionsExtensions.cs

@@ -21,48 +21,18 @@ public static IProjection WithAlias(this IProjection			projection,
 			return Projections.Alias(projection, aliasContainer);
 		}
 
-		/// <summary>
-		/// Project SQL function year()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-        [Obsolete("Please use DateTime.Year property instead")]
-		public static int YearPart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessYear(System.Linq.Expressions.Expression expression)
 		{
 			IProjection property = ExpressionProcessor.FindMemberProjection(expression).AsProjection();
 			return Projections.SqlFunction("year", NHibernateUtil.Int32, property);
 		}
 
-		/// <summary>
-		/// Project SQL function day()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Day property instead")]
-		public static int DayPart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessDay(System.Linq.Expressions.Expression expression)
 		{
 			IProjection property = ExpressionProcessor.FindMemberProjection(expression).AsProjection();
 			return Projections.SqlFunction("day", NHibernateUtil.Int32, property);
 		}
 
-		/// <summary>
-		/// Project SQL function month()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Month property instead")]
-		public static int MonthPart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessMonth(System.Linq.Expressions.Expression expression)
 		{
 			return SqlFunction("month", NHibernateUtil.Int32, expression);
@@ -74,61 +44,21 @@ private static IProjection SqlFunction(string name, IType type, System.Linq.Expr
 			return Projections.SqlFunction(name, type, property);
 		}
 
-		/// <summary>
-		/// Project SQL function hour()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Hour property instead")]
-		public static int HourPart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessHour(System.Linq.Expressions.Expression expression)
 		{
 			return SqlFunction("hour", NHibernateUtil.Int32, expression);
 		}
 
-		/// <summary>
-		/// Project SQL function minute()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Minute property instead")]
-		public static int MinutePart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessMinute(System.Linq.Expressions.Expression expression)
 		{
 			return SqlFunction("minute", NHibernateUtil.Int32, expression);
 		}
 
-		/// <summary>
-		/// Project SQL function second()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Second property instead")]
-		public static int SecondPart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessSecond(System.Linq.Expressions.Expression expression)
 		{
 			return SqlFunction("second", NHibernateUtil.Int32, expression);
 		}
 
-		/// <summary>
-		/// Project SQL function date()
-		/// Note: throws an exception outside of a QueryOver expression
-		/// </summary>
-		[Obsolete("Please use DateTime.Date property instead")]
-		public static DateTime DatePart(this DateTime dateTimeProperty)
-		{
-			throw new Exception("Not to be used directly - use inside QueryOver expression");
-		}
-
 		internal static IProjection ProcessDate(System.Linq.Expressions.Expression expression)
 		{
 			return SqlFunction("date", NHibernateUtil.Date, expression);

src/NHibernate/Impl/ExpressionProcessor.cs

@@ -174,17 +174,7 @@ static ExpressionProcessor()
 		    RegisterCustomProjection(() => default(DateTimeOffset).Second, e => ProjectionsExtensions.ProcessSecond(e.Expression));
 		    RegisterCustomProjection(() => default(DateTimeOffset).Date, e => ProjectionsExtensions.ProcessDate(e.Expression));
 
-#pragma warning disable 618
-			RegisterCustomProjection(() => ProjectionsExtensions.YearPart(default(DateTime)), e => ProjectionsExtensions.ProcessYear(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.DayPart(default(DateTime)), e => ProjectionsExtensions.ProcessDay(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.MonthPart(default(DateTime)), e => ProjectionsExtensions.ProcessMonth(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.HourPart(default(DateTime)), e => ProjectionsExtensions.ProcessHour(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.MinutePart(default(DateTime)), e => ProjectionsExtensions.ProcessMinute(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.SecondPart(default(DateTime)), e => ProjectionsExtensions.ProcessSecond(e.Arguments[0]));
-			RegisterCustomProjection(() => ProjectionsExtensions.DatePart(default(DateTime)), e => ProjectionsExtensions.ProcessDate(e.Arguments[0]));
-#pragma warning restore 618
-
-            RegisterCustomProjection(() => ProjectionsExtensions.Sqrt(default(int)), ProjectionsExtensions.ProcessSqrt);
+			RegisterCustomProjection(() => ProjectionsExtensions.Sqrt(default(int)), ProjectionsExtensions.ProcessSqrt);
 			RegisterCustomProjection(() => ProjectionsExtensions.Sqrt(default(double)), ProjectionsExtensions.ProcessSqrt);
 			RegisterCustomProjection(() => ProjectionsExtensions.Sqrt(default(decimal)), ProjectionsExtensions.ProcessSqrt);
 			RegisterCustomProjection(() => ProjectionsExtensions.Sqrt(default(byte)), ProjectionsExtensions.ProcessSqrt);