Skip to content

Fix ORDER BY alias resolution with AS in Cypher queries #2269

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
MuhammadTahaNaveed merged 1 commit into from
Dec 10, 2025
Merged

Fix ORDER BY alias resolution with AS in Cypher queries #2269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions regress/expected/cypher_match.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,10 +1655,10 @@ SELECT * FROM cypher('cypher_match', $$
$$) AS (u agtype, m agtype, l agtype);
u | m | l
------------+---------------+------------
"someone" | "opt_match_e" | "somebody"
"somebody" | "opt_match_e" | "someone"
"anybody" | "opt_match_e" | "nobody"
"nobody" | "opt_match_e" | "anybody"
"somebody" | "opt_match_e" | "someone"
"someone" | "opt_match_e" | "somebody"
(4 rows)

SELECT * FROM cypher('cypher_match', $$
Expand All @@ -1670,8 +1670,8 @@ SELECT * FROM cypher('cypher_match', $$
$$) AS (n agtype, r agtype, p agtype, m agtype, s agtype, q agtype);
n | r | p | m | s | q
-----------+---------------+------------+-----------+---------------+------------
"someone" | "opt_match_e" | "somebody" | "anybody" | "opt_match_e" | "nobody"
"anybody" | "opt_match_e" | "nobody" | "someone" | "opt_match_e" | "somebody"
"someone" | "opt_match_e" | "somebody" | "anybody" | "opt_match_e" | "nobody"
(2 rows)

SELECT * FROM cypher('cypher_match', $$
Expand All @@ -1684,18 +1684,18 @@ SELECT * FROM cypher('cypher_match', $$
$$) AS (n agtype, r agtype, p agtype, m agtype, s agtype, q agtype);
n | r | p | m | s | q
------------+---------------+------------+------------+---------------+------------
"someone" | "opt_match_e" | "somebody" | "anybody" | "opt_match_e" | "nobody"
"someone" | | | "somebody" | |
"someone" | | | "nobody" | |
"somebody" | | | "someone" | |
"somebody" | | | "anybody" | |
"somebody" | | | "nobody" | |
"anybody" | "opt_match_e" | "nobody" | "someone" | "opt_match_e" | "somebody"
"anybody" | | | "somebody" | |
"anybody" | | | "nobody" | |
"nobody" | | | "someone" | |
"nobody" | | | "somebody" | |
"anybody" | | | "somebody" | |
"nobody" | | | "anybody" | |
"nobody" | | | "somebody" | |
"nobody" | | | "someone" | |
"somebody" | | | "anybody" | |
"somebody" | | | "nobody" | |
"somebody" | | | "someone" | |
"someone" | "opt_match_e" | "somebody" | "anybody" | "opt_match_e" | "nobody"
"someone" | | | "nobody" | |
"someone" | | | "somebody" | |
(12 rows)

-- Tests to catch match following optional match logic
Expand Down
88 changes: 88 additions & 0 deletions regress/expected/expr.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6949,6 +6949,94 @@ $$) AS (i agtype);
{"key": "value"}
(9 rows)

--
-- Test ORDER BY with AS
--
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'John', age: 38}) $$) AS (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Jill', age: 23}) $$) AS (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Ion', age: 34}) $$) AS (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Mary', age: 57}) $$) AS (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Jerry', age: 34}) $$) AS (result agtype);
result
--------
(0 rows)

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name
$$) AS (name agtype, age agtype);
name | age
---------+-----
"Ion" | 34
"Jerry" | 34
"Jill" | 23
"John" | 38
"Mary" | 57
(5 rows)

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name ASC
$$) AS (name agtype, age agtype);
name | age
---------+-----
"Ion" | 34
"Jerry" | 34
"Jill" | 23
"John" | 38
"Mary" | 57
(5 rows)

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name DESC
$$) AS (name agtype, age agtype);
name | age
---------+-----
"Mary" | 57
"John" | 38
"Jill" | 23
"Jerry" | 34
"Ion" | 34
(5 rows)

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY age ASC, name DESCENDING
$$) AS (name agtype, age agtype);
name | age
---------+-----
"Jill" | 23
"Jerry" | 34
"Ion" | 34
"John" | 38
"Mary" | 57
(5 rows)

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY age DESC, name ASCENDING
$$) AS (name agtype, age agtype);
name | age
---------+-----
"Mary" | 57
"John" | 38
"Ion" | 34
"Jerry" | 34
"Jill" | 23
(5 rows)

--CASE
SELECT create_graph('case_statement');
NOTICE: graph "case_statement" has been created
Expand Down
30 changes: 30 additions & 0 deletions regress/sql/expr.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2823,6 +2823,7 @@ SELECT * FROM cypher('order_by', $$CREATE ({i: false})$$) AS (result agtype);
SELECT * FROM cypher('order_by', $$CREATE ({i: {key: 'value'}})$$) AS (result agtype);
SELECT * FROM cypher('order_by', $$CREATE ({i: [1]})$$) AS (result agtype);


SELECT * FROM cypher('order_by', $$
MATCH (u)
RETURN u.i
Expand All @@ -2835,6 +2836,35 @@ SELECT * FROM cypher('order_by', $$
ORDER BY u.i DESC
$$) AS (i agtype);

--
-- Test ORDER BY with AS
--
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'John', age: 38}) $$) AS (result agtype);
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Jill', age: 23}) $$) AS (result agtype);
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Ion', age: 34}) $$) AS (result agtype);
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Mary', age: 57}) $$) AS (result agtype);
SELECT * FROM cypher('order_by', $$ CREATE ({name: 'Jerry', age: 34}) $$) AS (result agtype);

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name
$$) AS (name agtype, age agtype);

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name ASC
$$) AS (name agtype, age agtype);

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY name DESC
$$) AS (name agtype, age agtype);

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY age ASC, name DESCENDING
$$) AS (name agtype, age agtype);

SELECT * FROM cypher('order_by', $$
MATCH (u) WHERE EXISTS(u.name) RETURN u.name AS name, u.age AS age ORDER BY age DESC, name ASCENDING
$$) AS (name agtype, age agtype);

--CASE
SELECT create_graph('case_statement');
SELECT * FROM cypher('case_statement', $$CREATE ({id: 1, i: 1, j: null})-[:connected_to {id: 1, k:0}]->({id: 2, i: 'a', j: 'b'})$$) AS (result agtype);
Expand Down
26 changes: 26 additions & 0 deletions src/backend/parser/cypher_clause.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2296,6 +2296,32 @@ static TargetEntry *find_target_list_entry(cypher_parsestate *cpstate,
ListCell *lt;
TargetEntry *te;

/*
* If the ORDER BY item is a simple identifier, check if it matches
* an alias in the target list. This implements SQL99-compliant
* alias matching for ORDER BY clauses.
*/
if (IsA(node, ColumnRef))
{
ColumnRef *cref = (ColumnRef *)node;

if (list_length(cref->fields) == 1)
{
char *name = strVal(linitial(cref->fields));

/* Try to match an alias in the target list */
foreach (lt, *target_list)
{
te = lfirst(lt);

if (te->resname != NULL && strcmp(te->resname, name) == 0)
{
return te;
}
}
}
}

expr = transform_cypher_expr(cpstate, node, expr_kind);

foreach (lt, *target_list)
Expand Down