extend test

Author: bahusoid

src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs

@@ -242,7 +242,7 @@ public async Task HqlAsync()
 
 		//NH-2926 (GH-1103)
 		[Test]
-		public async Task QueryOverOrderByIdProjectionDoesntThrowAsync()
+		public async Task QueryOverOrderByAndWhereWithIdProjectionDoesntThrowAsync()
 		{
 			// insert the new objects
 			using (ISession s = OpenSession())
@@ -262,10 +262,12 @@ public async Task QueryOverOrderByIdProjectionDoesntThrowAsync()
 
 			using (ISession s = OpenSession())
 			{
-				var results = await (s.QueryOver<ClassWithCompositeId>().Select(Projections.Id()).OrderBy(Projections.Id()).Desc.ListAsync<Id>());
-				Assert.That(results.Count, Is.EqualTo(2));
+				var results = await (s.QueryOver<ClassWithCompositeId>()
+								.Select(Projections.Id())
+								.Where(Restrictions.Eq(Projections.Id(), id))
+								.OrderBy(Projections.Id()).Desc.ListAsync<Id>());
+				Assert.That(results.Count, Is.EqualTo(1));
 			}
 		}
-
 	}
 }

src/NHibernate.Test/CompositeId/ClassWithCompositeIdFixture.cs

@@ -231,7 +231,7 @@ public void Hql()
 
 		//NH-2926 (GH-1103)
 		[Test]
-		public void QueryOverOrderByIdProjectionDoesntThrow()
+		public void QueryOverOrderByAndWhereWithIdProjectionDoesntThrow()
 		{
 			// insert the new objects
 			using (ISession s = OpenSession())
@@ -251,10 +251,12 @@ public void QueryOverOrderByIdProjectionDoesntThrow()
 
 			using (ISession s = OpenSession())
 			{
-				var results = s.QueryOver<ClassWithCompositeId>().Select(Projections.Id()).OrderBy(Projections.Id()).Desc.List<Id>();
-				Assert.That(results.Count, Is.EqualTo(2));
+				var results = s.QueryOver<ClassWithCompositeId>()
+								.Select(Projections.Id())
+								.Where(Restrictions.Eq(Projections.Id(), id))
+								.OrderBy(Projections.Id()).Desc.List<Id>();
+				Assert.That(results.Count, Is.EqualTo(1));
 			}
 		}
-
 	}
 }

src/NHibernate/Criterion/Order.cs

@@ -39,8 +39,8 @@ public virtual SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteria
 			SqlString[] columns = GetColumnsOrAliases(criteria, criteriaQuery);
 			bool[] toLowerColumns = ignoreCase ? FindStringColumns(criteria, criteriaQuery) : null;
 
-			var factory = criteriaQuery.Factory;
 			var fragment = new SqlStringBuilder();
+			var factory = criteriaQuery.Factory;
 			for (int i = 0; i < columns.Length; i++)
 			{
 				bool lower = toLowerColumns?[i] == true;