Clear Trail before counting (#659)

Author: MikeAlhayek

src/YesSql.Core/Services/DefaultQuery.cs

@@ -1132,6 +1132,7 @@ public async Task<int> CountAsync(CancellationToken cancellationToken = default)
             // Clear paging and order when counting 
             localBuilder.ClearOrder();
             localBuilder.ClearGroupBy();
+            localBuilder.ClearTrail();
             localBuilder.Skip(null);
             localBuilder.Take(null);
 

src/YesSql.Core/Sql/SqlBuilder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using YesSql.Utils;
 
 namespace YesSql.Sql
@@ -344,7 +343,7 @@ public virtual void Trail(string segment)
 
         public virtual void ClearTrail()
         {
-            TrailSegments.Clear();
+            _trail?.Clear();
         }
 
         public virtual string ToSqlString()
@@ -365,7 +364,7 @@ public virtual string ToSqlString()
                 if (_order != null)
                 {
                     sb.Append("ON(");
-                    sb.Append(OrderSegments.First());
+                    sb.Append(OrderSegments[0]);
                     sb.Append(") ");
                 }
             }

test/YesSql.Tests/CoreTests.cs

@@ -1043,6 +1043,42 @@ public async Task SavingRefreshedDocument()
             await Assert.ThrowsAsync<InvalidOperationException>(() => session.SaveAsync(newBill1));
         }
 
+        [Fact]
+        public async Task CountAsync_WhenCalledAfterListAsync_ReturnCorrectTotal()
+        {
+            _store.RegisterIndexes<PersonIndexProvider>();
+
+            await using (var session = _store.CreateSession())
+            {
+                var bill = new Person
+                {
+                    Firstname = "Bill",
+                    Lastname = "Gates"
+                };
+
+                var mike = new Person
+                {
+                    Firstname = "Mike",
+                    Lastname = "Alhayek"
+                };
+
+                await session.SaveAsync(bill);
+                await session.SaveAsync(mike);
+
+                await session.SaveChangesAsync();
+
+                var query = session.Query<Person, PersonByName>().OrderBy(x => x.DocumentId).Skip(1).Take(1);
+
+                var records = await query.ListAsync();
+
+                Assert.Equal(2, await query.CountAsync());
+
+                Assert.Single(records);
+
+                Assert.Equal("Mike", records.First().Firstname);
+            }
+        }
+
         [Fact]
         public async Task ShouldUpdateAutoFlushedIndex()
         {

test/YesSql.Tests/Indexes/PersonByName.cs

@@ -6,7 +6,10 @@ namespace YesSql.Tests.Indexes
 {
     public class PersonByName : MapIndex
     {
+        public long DocumentId { get; set; }
+
         public string SomeName { get; set; }
+
         public static string Normalize(string name)
         {
             return name.ToUpperInvariant();