[db] Fix path condition not adding element when it should #833 (#834)

fix distance less than or equal
agnesoft · Dec 8, 2023 · 2550ce5 · 2550ce5
1 parent 0b4987d
commit 2550ce5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/agdb/src/query/query_condition.rs b/agdb/src/query/query_condition.rs
@@ -178,8 +178,9 @@ impl CountComparison {
                 }
             },
             CountComparison::LessThanOrEqual(left) => match right.cmp(left) {
-                std::cmp::Ordering::Less => SearchControl::Continue(true),
-                std::cmp::Ordering::Equal => SearchControl::Stop(true),
+                std::cmp::Ordering::Less | std::cmp::Ordering::Equal => {
+                    SearchControl::Continue(true)
+                }
                 std::cmp::Ordering::Greater => SearchControl::Stop(false),
             },
             CountComparison::NotEqual(left) => match right.cmp(left) {
@@ -329,7 +330,7 @@ mod tests {
         assert_eq!(LessThan(2).compare_distance(2), Stop(false));
         assert_eq!(LessThan(2).compare_distance(1), Continue(true));
         assert_eq!(LessThanOrEqual(2).compare_distance(3), Stop(false));
-        assert_eq!(LessThanOrEqual(2).compare_distance(2), Stop(true));
+        assert_eq!(LessThanOrEqual(2).compare_distance(2), Continue(true));
         assert_eq!(LessThanOrEqual(2).compare_distance(1), Continue(true));
     }
 

diff --git a/agdb/tests/search_where_test.rs b/agdb/tests/search_where_test.rs
@@ -520,3 +520,17 @@ fn search_from_where_key_value_contains() {
         &[8],
     );
 }
+
+#[test]
+fn search_path_with_distance() {
+    let db = create_db();
+    db.exec_ids(
+        QueryBuilder::search()
+            .from("root")
+            .to("users")
+            .where_()
+            .distance(CountComparison::LessThanOrEqual(2))
+            .query(),
+        &[1, -4, 2],
+    );
+}