Skip to content

Return connected_paths as list in queries 5, 6, 7, 10 #27

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
dbrnz merged 1 commit into from
Jun 17, 2025
Merged

Return connected_paths as list in queries 5, 6, 7, 10 #27

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
8 changes: 4 additions & 4 deletions mapserver/competency/queries.d/query_10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ queries:
source_id,
path_id,
forward_path_id,
path_id || ' > ' || forward_path_id AS connected_paths
ARRAY[path_id, forward_path_id] AS connected_paths
FROM path_forward_connections
UNION ALL
SELECT
pfc.source_id,
pfc.path_id,
pf.forward_path_id,
pfc.path_id || ' > ' || pf.connected_paths AS connected_paths
pfc.path_id || pf.connected_paths AS connected_paths
FROM path_forward_connections pfc JOIN path_fc pf
ON pfc.source_id = pf.source_id
AND pfc.forward_path_id = pf.path_id
WHERE pf.connected_paths NOT LIKE '%' || pfc.forward_path_id || '%'
WHERE NOT pf.connected_paths @> ARRAY[pfc.forward_path_id]
),
path_fc_connected AS(
SELECT pfc.source_id, pfc.connected_paths, pfc.path_id, pnf.node_id, pnf.feature_id,
Expand All @@ -37,7 +37,7 @@ queries:
JOIN path_node_types pnt ON pnf.source_id = pnt.source_id AND
pnf.path_id = pnt.path_id AND pnf.node_id = pnt.node_id
UNION
SELECT pn.source_id, pn.path_id, pn.path_id, pnf.node_id, pnf.feature_id, pnt.type_id
SELECT pn.source_id, ARRAY[pn.path_id], pn.path_id, pnf.node_id, pnf.feature_id, pnt.type_id
FROM path_nodes pn JOIN path_node_features pnf ON pn.source_id = pnf.source_id
AND pn.path_id = pnf.path_id
JOIN path_node_types pnt ON pnf.source_id = pnt.source_id
Expand Down
10 changes: 5 additions & 5 deletions mapserver/competency/queries.d/query_5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ queries:
source_id,
path_id,
forward_path_id,
path_id || ' > ' || forward_path_id AS connected_paths
ARRAY[path_id, forward_path_id] AS connected_paths
FROM path_forward_connections
UNION ALL
SELECT
pfc.source_id,
pfc.path_id,
pf.forward_path_id,
pfc.path_id || ' > ' || pf.connected_paths AS connected_paths
pfc.path_id || pf.connected_paths AS connected_paths
FROM path_forward_connections pfc JOIN path_fc pf
ON pfc.source_id = pf.source_id
AND pfc.forward_path_id = pf.path_id
WHERE pf.connected_paths NOT LIKE '%' || pfc.forward_path_id || '%'
WHERE NOT pf.connected_paths @> ARRAY[pfc.forward_path_id]
),
path_fc_nodes AS(
SELECT
Expand Down Expand Up @@ -89,7 +89,7 @@ queries:
type: string
- key: connected_paths_0
label: Location_0 neuron population path
type: string
type: list
- key: path_start_1
label: Location_1 neuron population start
type: string
Expand All @@ -98,5 +98,5 @@ queries:
type: string
- key: connected_paths_1
label: Location_1 neuron population path
type: string
type: list

10 changes: 5 additions & 5 deletions mapserver/competency/queries.d/query_6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ queries:
source_id,
path_id,
forward_path_id,
path_id || ' > ' || forward_path_id AS connected_paths
ARRAY[path_id, forward_path_id] AS connected_paths
FROM path_forward_connections
UNION ALL
SELECT
pfc.source_id,
pfc.path_id,
pf.forward_path_id,
pfc.path_id || ' > ' || pf.connected_paths AS connected_paths
pfc.path_id || pf.connected_paths AS connected_paths
FROM path_forward_connections pfc JOIN path_fc pf
ON pfc.source_id = pf.source_id
AND pfc.forward_path_id = pf.path_id
WHERE pf.connected_paths NOT LIKE '%' || pfc.forward_path_id || '%'
WHERE NOT pf.connected_paths @> ARRAY[pfc.forward_path_id]
),
path_fc_nodes AS(
SELECT
Expand Down Expand Up @@ -99,7 +99,7 @@ queries:
type: string
- key: connected_paths_0
label: Location_0 neuron population path
type: string
type: list
- key: path_start_1
label: Location_1 neuron population start
type: string
Expand All @@ -108,5 +108,5 @@ queries:
type: string
- key: connected_paths_1
label: Location_1 neuron population path
type: string
type: list

10 changes: 5 additions & 5 deletions mapserver/competency/queries.d/query_7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ queries:
source_id,
path_id,
forward_path_id,
path_id || ' > ' || forward_path_id AS connected_paths
ARRAY[path_id, forward_path_id] AS connected_paths
FROM path_forward_connections
UNION ALL
SELECT
pfc.source_id,
pfc.path_id,
pf.forward_path_id,
pfc.path_id || ' > ' || pf.connected_paths AS connected_paths
pfc.path_id || pf.connected_paths AS connected_paths
FROM path_forward_connections pfc JOIN path_fc pf
ON pfc.source_id = pf.source_id
AND pfc.forward_path_id = pf.path_id
WHERE pf.connected_paths NOT LIKE '%' || pfc.forward_path_id || '%'
WHERE NOT pf.connected_paths @> ARRAY[pfc.forward_path_id]
),
path_fc_nodes AS(
SELECT
Expand Down Expand Up @@ -99,7 +99,7 @@ queries:
type: string
- key: connected_paths_0
label: Location_0 neuron population path
type: string
type: list
- key: path_start_1
label: Location_1 neuron population start
type: string
Expand All @@ -108,5 +108,5 @@ queries:
type: string
- key: connected_paths_1
label: Location_1 neuron population path
type: string
type: list