Fix most recent binding (#387)

Author: deanmarcussen

src/YesSql.Core/Services/DefaultQuery.cs

@@ -397,8 +397,18 @@ private void Bind<TIndex>() where TIndex : IIndex
 
         private void Bind(Type tIndex)
         {
-            if (_queryState.GetBindings().Contains(tIndex))
+            var bindings = _queryState.GetBindings();
+            var bindingIndex = bindings.IndexOf(tIndex);
+            if (bindingIndex != -1)
             {
+                // When a binding is reused it should be last to be correctly applied to a filter predicate.
+                if (bindingIndex != bindings.Count -1)
+                {
+                    var binding = bindings[bindingIndex];
+                    bindings.RemoveAt(bindingIndex);
+                    bindings.Insert(bindings.Count, binding);
+                }
+
                 return;
             }
 

test/YesSql.Tests/CoreTests.cs

@@ -2039,6 +2039,49 @@ public async Task ShouldJoinReduceIndex()
             }
         }
 
+        [Fact]
+        public async Task JoinOrderShouldNotMatter()
+        {
+            _store.RegisterIndexes<PersonIndexProvider>();
+            _store.RegisterIndexes<PersonAgeIndexProvider>();
+
+            using (var session = _store.CreateSession())
+            {
+                var bill = new Person
+                {
+                    Firstname = "Bill",
+                    Age = 1
+                };
+
+                var steve = new Person
+                {
+                    Firstname = "Steve",
+                    Age = 2
+                };
+
+                var paul = new Person
+                {
+                    Firstname = "Scott",
+                    Age = 2
+                };
+
+                session.Save(bill);
+                session.Save(steve);
+                session.Save(paul);
+
+                await session.SaveChangesAsync();
+            }
+
+            using (var session = _store.CreateSession())
+            {
+                Assert.Equal("Steve", (await session.Query().For<Person>()
+                    .With<PersonByName>(x => x.SomeName.StartsWith("S"))
+                    .With<PersonByAge>(x => x.Age == 2)
+                    .With<PersonByName>(x => x.SomeName.EndsWith("e"))
+                    .FirstOrDefaultAsync()).Firstname);
+            }
+        }
+
         [Fact]
         public async Task LoadingDocumentShouldNotDuplicateIndex()
         {