Clear query order when adding new order statements (#384)

sebastienros · May 13, 2021 · a47ceb4 · a47ceb4
1 parent a7236e3
commit a47ceb4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/src/YesSql.Core/Sql/SqlBuilder.cs b/src/YesSql.Core/Sql/SqlBuilder.cs
@@ -219,17 +219,20 @@ public void ClearOrder()
 
         public virtual void OrderBy(string orderBy)
         {
+            OrderSegments.Clear();
             OrderSegments.Add(orderBy);
         }
 
         public virtual void OrderByDescending(string orderBy)
         {
+            OrderSegments.Clear();
             OrderSegments.Add(orderBy);
             OrderSegments.Add(" DESC");
         }
 
         public virtual void OrderByRandom()
         {
+            OrderSegments.Clear();
             OrderSegments.Add(_dialect.RandomOrderByClause);
         }
 

diff --git a/test/YesSql.Tests/CoreTests.cs b/test/YesSql.Tests/CoreTests.cs
@@ -1953,6 +1953,40 @@ public async Task ShouldOrderJoinedMapIndexes()
             }
         }
 
+        [Fact]
+        public async Task ShouldClearOrders()
+        {
+            _store.RegisterIndexes<PersonIndexProvider>();
+
+            using (var session = _store.CreateSession())
+            {
+                var bill = new Person
+                {
+                    Firstname = "Bill",
+                    Lastname = "Gates",
+                };
+
+                var steve = new Person
+                {
+                    Firstname = "Steve",
+                    Lastname = "Balmer"
+                };
+
+                session.Save(bill);
+                session.Save(steve);
+
+                await session.SaveChangesAsync();
+            }
+
+            using (var session = _store.CreateSession())
+            {
+                var query = session.Query<Person, PersonByName>().OrderByDescending(x => x.SomeName);
+                query.OrderByDescending(x => x.SomeName);
+
+                Assert.Equal("Steve", (await query.FirstOrDefaultAsync()).Firstname);
+            }
+        }
+
         [Fact]
         public async Task ShouldJoinReduceIndex()
         {