SupportsSubSelectsInOrderBy false

Author: hazzik

src/NHibernate.Test/Async/Criteria/Lambda/SubQueryIntegrationFixture.cs

@@ -171,8 +171,8 @@ public async Task SubQueryAsync()
 		[Test]
 		public async Task ThreeLevelSubqueryAsync()
 		{
-			if (!Dialect.SupportsScalarSubSelects)
-				Assert.Ignore("Dialect does not support scalar sub-select");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
 
 			Person p = null;
 			var detachedCriteria2 = DetachedCriteria.For<Person>("vf_inner_2")

src/NHibernate.Test/Async/Linq/WhereSubqueryTests.cs

@@ -524,10 +524,10 @@ public async Task OrdersWithSubquery9SumAsync()
 		[Test(Description = "GH2479")]
 		public async Task OrdersWithSubquery11Async()
 		{
-			if (Dialect is MySQLDialect)
-				Assert.Ignore("MySQL does not support LIMIT in subqueries.");
-			if (Dialect is MsSqlCeDialect)
-				Assert.Ignore("MS SQL CE does not support sorting on a subquery.");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
+			if (!TestDialect.SupportsOrderByAndLimitInSubQueries)
+				Assert.Ignore("Dialect does not support sub-selects with order by or limit/top");
 
 			var ordersQuery = db.Orders
 			                    .OrderByDescending(x => x.OrderLines.Count).ThenBy(x => x.OrderId)

src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs

@@ -148,8 +148,8 @@ public async Task AggregatingHirearchyWithCountAsync()
         [Test]
         public async Task LimitingResultSetOnQueryThatIsOrderedByProjectionAsync()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+            if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using(var s = OpenSession())
             {
@@ -172,8 +172,8 @@ public async Task LimitingResultSetOnQueryThatIsOrderedByProjectionAsync()
         [Test]
         public async Task QueryingWithParemetersAndParaemtersInOrderByAsync()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+            if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using (var s = OpenSession())
             {

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

@@ -160,8 +160,8 @@ public void SubQuery()
 		[Test]
 		public void ThreeLevelSubquery()
 		{
-			if (!Dialect.SupportsScalarSubSelects)
-				Assert.Ignore("Dialect does not support scalar sub-select");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
 
 			Person p = null;
 			var detachedCriteria2 = DetachedCriteria.For<Person>("vf_inner_2")

src/NHibernate.Test/Linq/WhereSubqueryTests.cs

@@ -655,10 +655,10 @@ public void OrdersWithSubquery10A()
 		[Test(Description = "GH2479")]
 		public void OrdersWithSubquery11()
 		{
-			if (Dialect is MySQLDialect)
-				Assert.Ignore("MySQL does not support LIMIT in subqueries.");
-			if (Dialect is MsSqlCeDialect)
-				Assert.Ignore("MS SQL CE does not support sorting on a subquery.");
+			if (!TestDialect.SupportsSubSelectsInOrderBy)
+				Assert.Ignore("Dialect does not support order by sub-select");
+			if (!TestDialect.SupportsOrderByAndLimitInSubQueries)
+				Assert.Ignore("Dialect does not support sub-selects with order by or limit/top");
 
 			var ordersQuery = db.Orders
 			                    .OrderByDescending(x => x.OrderLines.Count).ThenBy(x => x.OrderId)

src/NHibernate.Test/ProjectionFixtures/Fixture.cs

@@ -137,8 +137,8 @@ public void AggregatingHirearchyWithCount()
         [Test]
         public void LimitingResultSetOnQueryThatIsOrderedByProjection()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+           	if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using(var s = OpenSession())
             {
@@ -161,8 +161,8 @@ public void LimitingResultSetOnQueryThatIsOrderedByProjection()
         [Test]
         public void QueryingWithParemetersAndParaemtersInOrderBy()
         {
-           if (!Dialect.SupportsScalarSubSelects)
-               Assert.Ignore("Dialect does not support scalar sub-select");
+           	if (!TestDialect.SupportsSubSelectsInOrderBy)
+               Assert.Ignore("Dialect does not support order by sub-select");
 
             using (var s = OpenSession())
             {

src/NHibernate.Test/TestDialect.cs

@@ -120,10 +120,15 @@ public bool SupportsSqlType(SqlType sqlType)
 		/// </summary>
 		public virtual bool SupportsModuloOnDecimal => true;
 
+		/// <summary>
+		/// Supports sub-selects in order by clause
+		/// </summary>
+		public virtual bool SupportsSubSelectsInOrderBy => _dialect.SupportsScalarSubSelects;
+
 		/// <summary>
 		/// Supports aggregating sub-selects in order by clause
 		/// </summary>
-		public virtual bool SupportsAggregatingScalarSubSelectsInOrderBy => _dialect.SupportsScalarSubSelects;
+		public virtual bool SupportsAggregatingScalarSubSelectsInOrderBy => SupportsSubSelectsInOrderBy;
 
 		/// <summary>
 		/// Supports order by and limits/top in correlated sub-queries

src/NHibernate.Test/TestDialects/DB2TestDialect.cs

@@ -6,7 +6,8 @@ public DB2TestDialect(Dialect.Dialect dialect) : base(dialect)
 		{
 		}
 
-		public override bool SupportsNonDataBoundCondition => false;
 		public override bool SupportsComplexExpressionInGroupBy => false;
+		public override bool SupportsNonDataBoundCondition => false;
+		public override bool SupportsSubSelectsInOrderBy => false;
 	}
 }