Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.
C aiderastclaude-codecode-analysiscode-intelligencecodexcursorcypherdeveloper-toolsgemini-cligraph-visualizationkilocodeknowledge-graphmcpmcp-servermodel-context-protocolopencodesqlitetree-sitterwindsurf
fix(cypher): defer WHERE until referenced bindings exist
lorenzozanee937ad47e5570
diff --git a/src/cypher/cypher.c b/src/cypher/cypher.cindex 3cc31f9d7..2a18db7e8 100644--- a/src/cypher/cypher.c+++ b/src/cypher/cypher.c@@ -4145,7 +4145,54 @@ static void execute_with_simple(cbm_return_clause_t *wc, binding_t *bindings, in}}-/* Apply post-WITH WHERE filter */+static bool condition_bindings_available(const cbm_condition_t *condition, binding_t *binding) {+ if (condition->variable && !binding_get(binding, condition->variable) &&+ !binding_get_edge(binding, condition->variable)) {+ return false;+ }+ for (int i = 0; i < condition->arg_count; i++) {+ const char *var = condition->args[i].variable;+ if (var && !binding_get(binding, var) && !binding_get_edge(binding, var)) {+ return false;+ }+ }+ return true;+}++static bool expr_bindings_available(const cbm_expr_t *expr, binding_t *binding) {+ if (!expr) {+ return true;+ }+ switch (expr->type) {+ case EXPR_CONDITION:+ return condition_bindings_available(&expr->cond, binding);+ case EXPR_AND:+ case EXPR_OR:+ case EXPR_XOR:+ return expr_bindings_available(expr->left, binding) &&+ expr_bindings_available(expr->right, binding);+ case EXPR_NOT:+ return expr_bindings_available(expr->left, binding);+ }+ return false;+}++static bool where_bindings_available(const cbm_where_clause_t *where, binding_t *binding) {+ if (!where) {+ return true;+ }+ if (where->root) {+ return expr_bindings_available(where->root, binding);+ }+ for (int i = 0; i < where->count; i++) {+ if (!condition_bindings_available(&where->conditions[i], binding)) {+ return false;+ }+ }+ return true;+}++/* Apply a WHERE filter after its referenced variables have been bound. */static void filter_bindings_where(const cbm_where_clause_t *where, binding_t *vbindings,int *vcount) {int kept = 0;@@ -5149,7 +5196,8 @@ static int execute_single(cbm_store_t *store, cbm_query_t *q, const char *projecbinding_t b = {0};b.store = store;binding_set(&b, var_name, &scanned[i]);- bool pass = !q->where || eval_where(q->where, &b);+ bool pass = !q->where || !where_bindings_available(q->where, &b) ||+ eval_where(q->where, &b);if (pass) {bindings[bind_count++] = b;} else {diff --git a/tests/test_cypher.c b/tests/test_cypher.cindex abd334683..b8e4ddb1f 100644--- a/tests/test_cypher.c+++ b/tests/test_cypher.c@@ -1757,6 +1757,32 @@ TEST(cypher_exists_has_outgoing_calls) {ASSERT_EQ(rc, 0);ASSERT_EQ(r.row_count, 2);cbm_cypher_result_free(&r);++ rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WHERE b.name <> \"SubmitOrder\" "+ "RETURN a.name, b.name",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 2);+ cbm_cypher_result_free(&r);++ rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WHERE b.name = \"SubmitOrder\" OR "+ "NOT b.name = \"SubmitOrder\" RETURN count(*)",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 1);+ ASSERT_STR_EQ(r.rows[0][0], "3");+ cbm_cypher_result_free(&r);++ rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WITH a, b WHERE NOT b.name = "+ "\"SubmitOrder\" RETURN a.name, b.name",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 2);+ cbm_cypher_result_free(&r);+cbm_store_close(s);PASS();}@@ -3150,6 +3176,65 @@ TEST(cypher_exec_where_not) {PASS();}+TEST(cypher_exec_where_not_target_node) {+ cbm_store_t *s = setup_cypher_store();+ cbm_cypher_result_t r = {0};+ int rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WHERE NOT b.name = \"SubmitOrder\" "+ "RETURN a.name, b.name",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 2);+ cbm_cypher_result_free(&r);+ cbm_store_close(s);+ PASS();+}++TEST(cypher_exec_where_not_target_relationship) {+ cbm_store_t *s = setup_cypher_multi_edge_store();+ cbm_cypher_result_t r = {0};+ int rc = cbm_cypher_execute(s,+ "MATCH (a)-[r:HTTP_CALLS]->(b) WHERE NOT r.url_path = "+ "\"/health\" RETURN r.url_path",+ "testproj", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 1);+ ASSERT_STR_EQ(r.rows[0][0], "/api/orders");+ cbm_cypher_result_free(&r);+ cbm_store_close(s);+ PASS();+}++TEST(cypher_exec_where_not_source_node) {+ cbm_store_t *s = setup_cypher_store();+ cbm_cypher_result_t r = {0};+ int rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WHERE NOT a.name = "+ "\"HandleOrder\" RETURN a.name, b.name",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 1);+ ASSERT_STR_EQ(r.rows[0][0], "ValidateOrder");+ cbm_cypher_result_free(&r);+ cbm_store_close(s);+ PASS();+}++TEST(cypher_exec_where_not_target_node_count) {+ cbm_store_t *s = setup_cypher_store();+ cbm_cypher_result_t r = {0};+ int rc = cbm_cypher_execute(s,+ "MATCH (a)-[:CALLS]->(b) WHERE NOT b.name = "+ "\"SubmitOrder\" RETURN count(*)",+ "test", 0, &r);+ ASSERT_EQ(rc, 0);+ ASSERT_EQ(r.row_count, 1);+ ASSERT_STR_EQ(r.rows[0][0], "2");+ cbm_cypher_result_free(&r);+ cbm_store_close(s);+ PASS();+}+TEST(cypher_exec_where_in) {cbm_store_t *s = setup_cypher_store();cbm_cypher_result_t r = {0};@@ -5005,6 +5090,10 @@ SUITE(cypher) {RUN_TEST(cypher_exec_where_neq_bang);RUN_TEST(cypher_exec_where_ends_with);RUN_TEST(cypher_exec_where_not);+ RUN_TEST(cypher_exec_where_not_target_node);+ RUN_TEST(cypher_exec_where_not_target_relationship);+ RUN_TEST(cypher_exec_where_not_source_node);+ RUN_TEST(cypher_exec_where_not_target_node_count);RUN_TEST(cypher_exec_where_in);RUN_TEST(cypher_exec_where_not_in);RUN_TEST(cypher_exec_where_is_null);