Merge pull request #480 from nsoranzo/dev

Fix last SQLAlchemy comparison broken during flake8'ing.
This commit is contained in:
Dannon Baker
2015-07-21 06:37:56 -04:00
+1 -1
View File
@@ -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()