Expose EnsureStableOrdering property in ODataSettings object

AutoMapper.AspNetCore.OData.EFCore/LinqExtensions.cs

@@ -196,6 +196,9 @@ public static Expression GetQueryableMethod(this Expression expression,
                 if (orderBySettings is null)
                     return null;
 
+                if (oDataSettings?.AlwaysSortByPrimaryKey is false)
+                    return expression.GetSkipCall(skip).GetTakeCall(top);
+
                 return expression
                     .GetDefaultOrderByCall(orderBySettings)
                     .GetSkipCall(skip)

AutoMapper.AspNetCore.OData.EFCore/ODataSettings.cs

@@ -41,7 +41,7 @@ public class ODataSettings
         /// Default is true.
         /// </value>
         public bool EnableConstantParameterization { get; set; } = true;
-        
+
         /// <summary>
         /// If sets to true, orderBy pk desc will always be present on main entity. 
         /// </summary>

AutoMapper.OData.EFCore.Tests/GetQueryTests.cs

@@ -896,6 +896,62 @@ void Test(IQueryable<CoreBuilding> queryable)
             }
         }
 
+        [Fact]
+        public void BuildingsFilterNameWithTopAndDisabledAlwaysSortByPrimaryKey()
+        {
+            string query = "/corebuilding?$filter=contains(Name, 'Two L2')&$top=10";
+            Test(GetQuery<CoreBuilding, TBuilding>(query, querySettings: new() { ODataSettings = new() { AlwaysSortByPrimaryKey = false } }));
+
+            void Test(IQueryable<CoreBuilding> queryable)
+            {
+                string sqlQuery = queryable.ToQueryString();
+                Assert.Contains("TOP", sqlQuery);
+                Assert.DoesNotContain("ORDER BY [o].[Identifier]", sqlQuery);
+            }
+        }
+
+        [Fact]
+        public void BuildingsFilterNameWithTopAndEnabledAlwaysSortByPrimaryKey()
+        {
+            string query = "/corebuilding?$filter=contains(Name, 'Two L2')&$top=10";
+            Test(GetQuery<CoreBuilding, TBuilding>(query, querySettings: new() { ODataSettings = new() { AlwaysSortByPrimaryKey = true } }));
+
+            void Test(IQueryable<CoreBuilding> queryable)
+            {
+                string sqlQuery = queryable.ToQueryString();
+                Assert.Contains("TOP", sqlQuery);
+                Assert.Contains("ORDER BY [o].[Identifier]", sqlQuery);
+            }
+        }
+
+        [Fact]
+        public void BuildingsFilterNameWithSkipAndDisabledAlwaysSortByPrimaryKey()
+        {
+            string query = "/corebuilding?$filter=contains(Name, 'Two L2')&$skip=10";
+            Test(GetQuery<CoreBuilding, TBuilding>(query, querySettings: new() { ODataSettings = new() { AlwaysSortByPrimaryKey = false } }));
+
+            void Test(IQueryable<CoreBuilding> queryable)
+            {
+                string sqlQuery = queryable.ToQueryString();
+                Assert.Contains("OFFSET", sqlQuery);
+                Assert.DoesNotContain("ORDER BY [o].[Identifier]", sqlQuery);
+            }
+        }
+
+        [Fact]
+        public void BuildingsFilterNameWithSkipAndEnabledAlwaysSortByPrimaryKey()
+        {
+            string query = "/corebuilding?$filter=contains(Name, 'Two L2')&$skip=10";
+            Test(GetQuery<CoreBuilding, TBuilding>(query, querySettings: new() { ODataSettings = new() { AlwaysSortByPrimaryKey = true } }));
+
+            void Test(IQueryable<CoreBuilding> queryable)
+            {
+                string sqlQuery = queryable.ToQueryString();
+                Assert.Contains("OFFSET", sqlQuery);
+                Assert.Contains("ORDER BY [o].[Identifier]", sqlQuery);
+            }
+        }
+
         [Fact]
         public async Task OpsTenantOrderByCountOfReference()
         {