Skip to content

Commit 6cbfe3a

Browse files
committed
SELECT change
1 parent bb219a5 commit 6cbfe3a

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

qiita_db/processing_job.py

+11-10
Original file line numberDiff line numberDiff line change
@@ -583,17 +583,18 @@ def create(cls, user, parameters, force=False):
583583
with TTRN:
584584
command = parameters.command
585585
if not force:
586-
587586
# check if a job with the same parameters already exists
588-
sql = """SELECT processing_job_id, processing_job_status
589-
FROM qiita.processing_job
590-
LEFT JOIN qiita.processing_job_status
591-
USING (processing_job_status_id)
592-
LEFT JOIN qiita.artifact_output_processing_job aopj
593-
USING (processing_job_id)
594-
WHERE command_id = %s AND processing_job_status IN (
595-
'success', 'waiting', 'running', 'in_construction')
596-
{0}"""
587+
sql = """SELECT processing_job_id, email,
588+
processing_job_status, COUNT(aopj.artifact_id)
589+
FROM qiita.processing_job
590+
LEFT JOIN qiita.processing_job_status
591+
USING (processing_job_status_id)
592+
LEFT JOIN qiita.artifact_output_processing_job aopj
593+
USING (processing_job_id)
594+
WHERE command_id = %s AND processing_job_status IN (
595+
'success', 'waiting', 'running', 'in_construction') {0}
596+
GROUP BY processing_job_id, email,
597+
processing_job_status"""
597598

598599
# we need to use ILIKE because of booleans as they can be
599600
# false or False

0 commit comments

Comments
 (0)