Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_diff.sql

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/share/disttool_definebyquery_diff.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_diff.sql

@@ -2 +2 @@
     'diff' as stage,
     diffRun.diff_id AS stage_id,
+    diffRun.magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    diffRun.label,
+    diffRun.data_group,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -14 +17 @@
 JOIN rawExp USING(exp_id)
 JOIN distTarget ON distTarget.stage = 'diff'
-    AND diffRun.label = distTarget.label
     AND distTarget.filter = rawExp.filter
+    AND distTarget.dist_group = diffRun.dist_group
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'diff' AND (distRun.stage_id = diff_id)
-    AND distRun.clean = distTarget.clean
+LEFT JOIN distRun ON (distRun.stage_id = diff_id)
+                  AND distTarget.target_id = distRun.target_id
     -- JOIN hook %s
 WHERE  distTarget.state = 'enabled'