Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions helix-db/src/helixc/generator/traversal_steps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,108 @@ impl Display for WhereRef {
);
}
}

// Handle traversals with prefix steps before property access + BoolOp
// Pattern: [traversal steps...] + [PropertyFetch or ReservedPropertyAccess] + BoolOp
if is_val && traversal.steps.len() > 2 {
let last_idx = traversal.steps.len() - 1;
let second_last_idx = traversal.steps.len() - 2;

let last_step = traversal.steps[last_idx].inner();
let second_last_step = traversal.steps[second_last_idx].inner();

// Check if pattern matches: [...] + PropertyAccess + BoolOp
if let Step::BoolOp(bool_op) = last_step {
// Build the prefix traversal steps (all steps except the last 2)
let prefix_steps = &traversal.steps[..second_last_idx];

// Generate the traversal chain for prefix steps
let traversal_chain = prefix_steps
.iter()
.map(|sep| format!("{}", sep))
.collect::<Vec<_>>()
.join("");

match second_last_step {
// Case 1: PropertyFetch (e.g., _::ToN::{age}::EQ(id))
Step::PropertyFetch(prop) => {
let bool_expr = match bool_op {
BoolOp::Eq(eq) => format!("{eq}"),
BoolOp::Neq(neq) => format!("{neq}"),
BoolOp::Gt(gt) => format!("{gt}"),
BoolOp::Gte(gte) => format!("{gte}"),
BoolOp::Lt(lt) => format!("{lt}"),
BoolOp::Lte(lte) => format!("{lte}"),
BoolOp::Contains(c) => format!("v{c}"),
BoolOp::IsIn(i) => format!("v{i}"),
BoolOp::PropertyEq(p) => format!("{p}"),
BoolOp::PropertyNeq(p) => format!("{p}"),
};

return write!(
f,
"filter_ref(|val, txn|{{
if let Ok(val) = val {{
Ok(G::from_iter(&db, &txn, std::iter::once(val.clone()), &arena)
{}
.next()
.map_or(false, |res| {{
res.map_or(false, |node| {{
node.get_property({}).map_or(false, |v| {})
}})
}}))
}} else {{
Ok(false)
}}
}})",
traversal_chain, prop, bool_expr
);
}

// Case 2: ReservedPropertyAccess (e.g., _::ToN::ID::EQ(id))
Step::ReservedPropertyAccess(reserved_prop) => {
let value_expr = match reserved_prop {
ReservedProp::Id => "Value::Id(ID::from(node.id()))".to_string(),
ReservedProp::Label => "Value::from(node.label())".to_string(),
};
let bool_expr = match bool_op {
BoolOp::Eq(eq) => format!("{} == {}", value_expr, eq.right),
BoolOp::Neq(neq) => format!("{} != {}", value_expr, neq.right),
BoolOp::Gt(gt) => format!("{} > {}", value_expr, gt.right),
BoolOp::Gte(gte) => format!("{} >= {}", value_expr, gte.right),
BoolOp::Lt(lt) => format!("{} < {}", value_expr, lt.right),
BoolOp::Lte(lte) => format!("{} <= {}", value_expr, lte.right),
BoolOp::Contains(c) => format!("{}{}", value_expr, c),
BoolOp::IsIn(i) => format!("{}{}", value_expr, i),
BoolOp::PropertyEq(_) | BoolOp::PropertyNeq(_) => {
"compile_error!(\"PropertyEq/PropertyNeq cannot be used with reserved properties\")".to_string()
}
};

return write!(
f,
"filter_ref(|val, txn|{{
if let Ok(val) = val {{
Ok(G::from_iter(&db, &txn, std::iter::once(val.clone()), &arena)
{}
.next()
.map_or(false, |res| {{
res.map_or(false, |node| {{
{}
}})
}}))
}} else {{
Ok(false)
}}
}})",
traversal_chain, bool_expr
);
}

_ => {} // Fall through to default
}
}
}
}

// Fall back to default (unoptimized) code generation
Expand Down
9 changes: 9 additions & 0 deletions hql-tests/tests/where_traversal_property_access/helix.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[project]
name = "where_traversal_property_access"
queries = "."

[local.dev]
port = 6969
build_mode = "dev"

[cloud]
38 changes: 38 additions & 0 deletions hql-tests/tests/where_traversal_property_access/queries.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Test cases for GitHub issue #847
// WHERE clauses with traversal steps before property access

// Test 1: ReservedPropertyAccess with ToN (original issue case)
// Pattern: _::ToN::ID::EQ(id)
QUERY testToNId(id: ID) =>
edges <- N<Person>::OutE<Knows>::WHERE(_::ToN::ID::EQ(id))
RETURN edges

// Test 2: ReservedPropertyAccess with FromN
// Pattern: _::FromN::ID::EQ(id)
QUERY testFromNId(id: ID) =>
edges <- N<Person>::OutE<Knows>::WHERE(_::FromN::ID::EQ(id))
RETURN edges

// Test 3: PropertyFetch with ToN (original issue case)
// Pattern: _::ToN::{age}::EQ(age)
QUERY testToNProperty(age: I32) =>
edges <- N<Person>::OutE<Knows>::WHERE(_::ToN::{age}::EQ(age))
RETURN edges

// Test 4: PropertyFetch with FromN
// Pattern: _::FromN::{name}::EQ(name)
QUERY testFromNProperty(name: String) =>
edges <- N<Person>::OutE<Knows>::WHERE(_::FromN::{name}::EQ(name))
RETURN edges

// Test 5: Simple 2-step case (should still work - regression test)
// Pattern: _::ID::EQ(id)
QUERY testSimpleId(id: ID) =>
nodes <- N<Person>::WHERE(_::ID::EQ(id))
RETURN nodes

// Test 6: Simple 2-step property fetch (should still work - regression test)
// Pattern: _{age}::EQ(age)
QUERY testSimpleProperty(age: I32) =>
nodes <- N<Person>::WHERE(_::{age}::EQ(age))
RETURN nodes
12 changes: 12 additions & 0 deletions hql-tests/tests/where_traversal_property_access/schema.hx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
N::Person {
name: String,
age: I32
}

E::Knows {
From: Person,
To: Person,
Properties: {
since: I32
}
}
Loading