From 447919b4cf5864cadf2f731c2e1e3b0b48750c8d Mon Sep 17 00:00:00 2001 From: Bart Scheers Date: Fri, 2 Oct 2015 10:01:43 +0200 Subject: [PATCH 1/2] Issue 476, resolving test_alchemy The SQL median function in MonetDB, is called by prefixing it with sys. --- tkp/db/alchemy.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tkp/db/alchemy.py b/tkp/db/alchemy.py index d860b473d..ce89f6797 100644 --- a/tkp/db/alchemy.py +++ b/tkp/db/alchemy.py @@ -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) @@ -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). \ From 1e6914d28865e1e38520209ebdcd80a927618b95 Mon Sep 17 00:00:00 2001 From: Bart Scheers Date: Fri, 2 Oct 2015 10:01:43 +0200 Subject: [PATCH 2/2] Issue 476, resolving test_alchemy The SQL median function in MonetDB, is called by prefixing it with sys. --- tkp/db/alchemy.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tkp/db/alchemy.py b/tkp/db/alchemy.py index d860b473d..ce89f6797 100644 --- a/tkp/db/alchemy.py +++ b/tkp/db/alchemy.py @@ -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) @@ -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). \