Skip to content

Issue 476, resolving test_alchemy #482

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

Open
bartscheers wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue 476, resolving test_alchemy #482

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
447919b
Issue 476, resolving test_alchemy
bartscheers Oct 2, 2015
1e6914d
Issue 476, resolving test_alchemy
bartscheers Oct 2, 2015
134acf5
Merge branch 'iss476' of github.com:bartscheers/tkp into iss476
bartscheers Oct 26, 2015
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
5 changes: 4 additions & 1 deletion tkp/db/alchemy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from sqlalchemy.orm import aliased
from sqlalchemy.sql import func

from tkp.config import get_database_config
from tkp.db.model import (Assocxtrsource, Extractedsource, Image, Newsource,
Runningcatalog)

Expand Down Expand Up @@ -159,7 +160,9 @@ def _combined(session, dataset):
newsrc_trigger_query.c.sigma_rms_min.label('sigma_rms_min'),
func.max(agg_ex.f_int).label('lightcurve_max'),
func.avg(agg_ex.f_int).label('lightcurve_avg'),
func.median(agg_ex.f_int).label('lightcurve_median')
func.median(agg_ex.f_int).label('lightcurve_median') \
if get_database_config()['engine'] == "postgresql" \
else func.sys.median(agg_ex.f_int).label('lightcurve_median')
). \
select_from(last_ts_fmax_query). \
join(match_assoc, match_assoc.runcat_id == last_ts_fmax_query.c.runcat_id). \
Expand Down