From b0c6512c5b61e9e948d9d8304973b03d07b8d1c7 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 20 Jul 2015 15:36:59 -0400 Subject: [PATCH 1/3] Fix more sqlalchemy comparisons broken during flake8'ing. --- lib/galaxy/jobs/handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py index c549dec40b4..579c6660a14 100644 --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -112,7 +112,7 @@ class JobHandlerQueue( object ): .outerjoin( model.User ) \ .filter( model.Job.state.in_( in_list ) & ( model.Job.handler == self.app.config.server_name ) & - or_( ( model.Job.user_id is None ), ( model.User.active == true() ) ) ).all() + or_( ( model.Job.user_id == null() ), ( model.User.active == true() ) ) ).all() else: jobs_at_startup = self.sa_session.query( model.Job ).enable_eagerloads( False ) \ .filter( model.Job.state.in_( in_list ) & @@ -220,7 +220,7 @@ class JobHandlerQueue( object ): jobs_to_check = self.sa_session.query(model.Job).enable_eagerloads(False) \ .outerjoin( model.User ) \ .filter(and_((model.Job.state == model.Job.states.NEW), - or_((model.Job.user_id is None), (model.User.active == true())), + or_((model.Job.user_id == null()), (model.User.active == true())), (model.Job.handler == self.app.config.server_name), ~model.Job.table.c.id.in_(hda_not_ready), ~model.Job.table.c.id.in_(ldda_not_ready))) \ From fed3bddc30de17332bc31cc9f4f94d372626cd54 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 20 Jul 2015 15:38:36 -0400 Subject: [PATCH 2/3] Import null, oops. --- lib/galaxy/jobs/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py index 579c6660a14..3d7d1869b1a 100644 --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -8,7 +8,7 @@ import logging import threading from Queue import Queue, Empty -from sqlalchemy.sql.expression import and_, or_, select, func, true +from sqlalchemy.sql.expression import and_, or_, select, func, true, null from galaxy import model from galaxy.util.sleeper import Sleeper From 4ba3cf2a13645ecaed119c070b0cd7add1471707 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Tue, 21 Jul 2015 02:48:19 +0200 Subject: [PATCH 3/3] Fix last SQLAlchemy comparison broken in 9805294f9773968b2a9707a814fc41dbf596a8a0 . --- lib/galaxy/jobs/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/handler.py b/lib/galaxy/jobs/handler.py index 3d7d1869b1a..d7720bcaf00 100644 --- a/lib/galaxy/jobs/handler.py +++ b/lib/galaxy/jobs/handler.py @@ -212,7 +212,7 @@ class JobHandlerQueue( object ): .join(model.LibraryDatasetDatasetAssociation) \ .join(model.Dataset) \ .filter(and_((model.Job.state == model.Job.states.NEW), - or_((model.LibraryDatasetDatasetAssociation._state is not None), + or_((model.LibraryDatasetDatasetAssociation._state != null()), (model.LibraryDatasetDatasetAssociation.deleted == true()), (model.Dataset.state != model.Dataset.states.OK), (model.Dataset.deleted == true())))).subquery()