Skip to content

Inject subqueries before WITH statements in generated query. #894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariusconjeaud merged 2 commits into from
Sep 22, 2025
Merged

Inject subqueries before WITH statements in generated query. #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbf7a68
Fix display
mariusconjeaud Jun 19, 2025
cd6129e
Inject subqueries before WITH statements in generated query.
tonioo Sep 22, 2025
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
1 change: 1 addition & 0 deletions doc/source/advanced_query_operations.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Options for `intermediate_transform` *variables* are:
- `include_in_return`: `bool` - whether to include the variable in the return statement. Defaults to False.

Additional options for the `intermediate_transform` method are:

- `distinct`: `bool` - whether to deduplicate the results. Defaults to False.

Here is a full example::
Expand Down
57 changes: 29 additions & 28 deletions neomodel/async_/match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,34 @@ def build_query(self) -> str:
query += self._ast.with_clause

returned_items: list[str] = []
if hasattr(self.node_set, "_subqueries"):
for subquery in self.node_set._subqueries:
query += " CALL {"
if subquery["initial_context"]:
query += " WITH "
context: list[str] = []
for var in subquery["initial_context"]:
if isinstance(var, (NodeNameResolver, RelationNameResolver)):
context.append(var.resolve(self))
else:
context.append(var)
query += ",".join(context)

query += f"{subquery['query']} }} "
self._query_params.update(subquery["query_params"])
for varname in subquery["return_set"]:
# We declare the returned variables as "virtual" relations of the
# root node class to make sure they will be translated by a call to
# resolve_subgraph() (otherwise, they will be lost).
# This is probably a temporary solution until we find something better...
self._ast.subgraph[varname] = {
"target": None, # We don't need target class in this use case
"children": {},
"variable_name": varname,
"rel_variable_name": varname,
}
returned_items += subquery["return_set"]

if hasattr(self.node_set, "_intermediate_transforms"):
for transform in self.node_set._intermediate_transforms:
query += " WITH "
Expand All @@ -970,6 +998,7 @@ def build_query(self) -> str:
# Reset return list since we'll probably invalidate most variables
self._ast.return_clause = ""
self._ast.additional_return = []
returned_items = []
for name, varprops in transform["vars"].items():
source = varprops["source"]
if isinstance(source, (NodeNameResolver, RelationNameResolver)):
Expand Down Expand Up @@ -997,34 +1026,6 @@ def build_query(self) -> str:
ordering.append(item)
query += ",".join(ordering)

if hasattr(self.node_set, "_subqueries"):
for subquery in self.node_set._subqueries:
query += " CALL {"
if subquery["initial_context"]:
query += " WITH "
context: list[str] = []
for var in subquery["initial_context"]:
if isinstance(var, (NodeNameResolver, RelationNameResolver)):
context.append(var.resolve(self))
else:
context.append(var)
query += ",".join(context)

query += f"{subquery['query']} }} "
self._query_params.update(subquery["query_params"])
for varname in subquery["return_set"]:
# We declare the returned variables as "virtual" relations of the
# root node class to make sure they will be translated by a call to
# resolve_subgraph() (otherwise, they will be lost).
# This is probably a temporary solution until we find something better...
self._ast.subgraph[varname] = {
"target": None, # We don't need target class in this use case
"children": {},
"variable_name": varname,
"rel_variable_name": varname,
}
returned_items += subquery["return_set"]

query += " RETURN "
if self._ast.return_clause and not self._subquery_namespace:
returned_items.append(self._ast.return_clause)
Expand Down
57 changes: 29 additions & 28 deletions neomodel/sync_/match.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,34 @@ def build_query(self) -> str:
query += self._ast.with_clause

returned_items: list[str] = []
if hasattr(self.node_set, "_subqueries"):
for subquery in self.node_set._subqueries:
query += " CALL {"
if subquery["initial_context"]:
query += " WITH "
context: list[str] = []
for var in subquery["initial_context"]:
if isinstance(var, (NodeNameResolver, RelationNameResolver)):
context.append(var.resolve(self))
else:
context.append(var)
query += ",".join(context)

query += f"{subquery['query']} }} "
self._query_params.update(subquery["query_params"])
for varname in subquery["return_set"]:
# We declare the returned variables as "virtual" relations of the
# root node class to make sure they will be translated by a call to
# resolve_subgraph() (otherwise, they will be lost).
# This is probably a temporary solution until we find something better...
self._ast.subgraph[varname] = {
"target": None, # We don't need target class in this use case
"children": {},
"variable_name": varname,
"rel_variable_name": varname,
}
returned_items += subquery["return_set"]

if hasattr(self.node_set, "_intermediate_transforms"):
for transform in self.node_set._intermediate_transforms:
query += " WITH "
Expand All @@ -968,6 +996,7 @@ def build_query(self) -> str:
# Reset return list since we'll probably invalidate most variables
self._ast.return_clause = ""
self._ast.additional_return = []
returned_items = []
for name, varprops in transform["vars"].items():
source = varprops["source"]
if isinstance(source, (NodeNameResolver, RelationNameResolver)):
Expand Down Expand Up @@ -995,34 +1024,6 @@ def build_query(self) -> str:
ordering.append(item)
query += ",".join(ordering)

if hasattr(self.node_set, "_subqueries"):
for subquery in self.node_set._subqueries:
query += " CALL {"
if subquery["initial_context"]:
query += " WITH "
context: list[str] = []
for var in subquery["initial_context"]:
if isinstance(var, (NodeNameResolver, RelationNameResolver)):
context.append(var.resolve(self))
else:
context.append(var)
query += ",".join(context)

query += f"{subquery['query']} }} "
self._query_params.update(subquery["query_params"])
for varname in subquery["return_set"]:
# We declare the returned variables as "virtual" relations of the
# root node class to make sure they will be translated by a call to
# resolve_subgraph() (otherwise, they will be lost).
# This is probably a temporary solution until we find something better...
self._ast.subgraph[varname] = {
"target": None, # We don't need target class in this use case
"children": {},
"variable_name": varname,
"rel_variable_name": varname,
}
returned_items += subquery["return_set"]

query += " RETURN "
if self._ast.return_clause and not self._subquery_namespace:
returned_items.append(self._ast.return_clause)
Expand Down