From c6ecd991d2a5f5413890285a9d1cfc293ab7fff5 Mon Sep 17 00:00:00 2001
From: Leo Gordon <lg4@ebi.ac.uk>
Date: Tue, 13 Nov 2012 13:07:26 +0000
Subject: [PATCH] bugfix: msg view should behave when analysis_id is still NULL
---
sql/patch_2012-11-13.sql | 4 ++--
sql/procedures.mysql | 4 ++--
sql/procedures.sqlite | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sql/patch_2012-11-13.sql b/sql/patch_2012-11-13.sql
index b1afb7228..43d56d916 100644
--- a/sql/patch_2012-11-13.sql
+++ b/sql/patch_2012-11-13.sql
@@ -7,6 +7,6 @@ CREATE OR REPLACE VIEW msg AS
SELECT a.analysis_id, a.logic_name, m.*
FROM job_message m
JOIN worker w USING (worker_id)
- JOIN analysis_base a USING (analysis_id)
- LEFT JOIN job j USING (job_id);
+ LEFT JOIN analysis_base a ON (a.analysis_id=w.analysis_id)
+ LEFT JOIN job j ON (j.job_id=m.job_id);
diff --git a/sql/procedures.mysql b/sql/procedures.mysql
index 244e3b73b..e9ff3ef2c 100644
--- a/sql/procedures.mysql
+++ b/sql/procedures.mysql
@@ -35,8 +35,8 @@ CREATE OR REPLACE VIEW msg AS
SELECT a.analysis_id, a.logic_name, m.*
FROM job_message m
JOIN worker w USING (worker_id)
- JOIN analysis_base a USING (analysis_id)
- LEFT JOIN job j USING (job_id);
+ LEFT JOIN analysis_base a ON (a.analysis_id=w.analysis_id)
+ LEFT JOIN job j ON (j.job_id=m.job_id);
#### time an analysis or group of analyses (given by a name pattern) ######################################
diff --git a/sql/procedures.sqlite b/sql/procedures.sqlite
index 49b79e918..61095d6d5 100644
--- a/sql/procedures.sqlite
+++ b/sql/procedures.sqlite
@@ -35,6 +35,6 @@ CREATE VIEW IF NOT EXISTS msg AS
SELECT a.analysis_id, a.logic_name, m.*
FROM job_message m
JOIN worker w USING (worker_id)
- JOIN analysis_base a USING (analysis_id)
- LEFT JOIN job j ON (m.job_id=j.job_id);
+ LEFT JOIN analysis_base a ON (a.analysis_id=w.analysis_id)
+ LEFT JOIN job j ON (j.job_id=m.job_id);
--
GitLab