Skip to content
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

Jump to bottom

G3-339: Fixing edit genes error. #15

Merged
merged 2 commits into from
Aug 6, 2024
Merged

G3-339: Fixing edit genes error. #15

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
839c94d
Changing array_accum to array_agg
bergsalex Aug 6, 2024
61865a9
Merge branch 'main' into G3-339-error-when-editing-genes
bergsalex Aug 6, 2024
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "geneweaver-legacy"
version = "1.3.4a1"
version = "1.3.5"
description = ""
authors = ["Alexander Berger <alexander.berger@jax.org>"]
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions src/geneweaverdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4188,8 +4188,8 @@ def get_temp_geneset_values(geneset_id):
"""
with PooledCursor() as cursor:
cursor.execute('''SELECT gs_id, ode_gene_id, avg(src_value) as gsv_value,
count(ode_gene_id) as gsv_hits, array_accum(src_id) as gsv_source_list,
array_accum(src_value) as gsv_value_list,'t' as gsv_in_threshold, now() as gsv_date
count(ode_gene_id) as gsv_hits, array_agg(src_id) as gsv_source_list,
array_agg(src_value) as gsv_value_list,'t' as gsv_in_threshold, now() as gsv_date
FROM production.temp_geneset_value
WHERE gs_id=%s GROUP BY gs_id, ode_gene_id ORDER BY ode_gene_id;''' % (
geneset_id,))
Expand Down
4 changes: 2 additions & 2 deletions src/uploadfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,8 +780,8 @@ def insert_into_geneset_value_by_gsid(gsid):
cursor.execute('''INSERT INTO extsrc.geneset_value (gs_id, ode_gene_id, gsv_value, gsv_hits, gsv_source_list,
gsv_value_list, gsv_in_threshold, gsv_date)
SELECT gs_id, ode_gene_id, avg(src_value) as gsv_value,
count(ode_gene_id) as gsv_hits, array_accum(src_id) as gsv_source_list,
array_accum(src_value) as gsv_value_list,'t' as gsv_in_threshold, now() as gsv_date
count(ode_gene_id) as gsv_hits, array_agg(src_id) as gsv_source_list,
array_agg(src_value) as gsv_value_list,'t' as gsv_in_threshold, now() as gsv_date
FROM production.temp_geneset_value
WHERE gs_id=%s GROUP BY gs_id,ode_gene_id ORDER BY ode_gene_id;''' % (gsid,))
## Update geneset sp_id and identifier
Expand Down
Loading