Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_fake.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_fake.sql (modified) (2 diffs)

branches/simtest_nebulous_branches/ippTools/share/disttool_definebyquery_fake.sql

@@ -2 +2 @@
     'fake' as stage,
     fakeRun.fake_id AS stage_id,
+    CAST(0 AS SIGNED) AS magicked,
     rawExp.exp_name as run_tag,
-    distTarget.label,
+    fakeRun.label,
+    fakeRun.data_group,
+    distTarget.dist_group,
     distTarget.target_id,
     distTarget.clean
@@ -10 +13 @@
 JOIN chipRun USING(chip_id)
 JOIN rawExp USING(exp_id)
-JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.label = distTarget.label
+JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.dist_group = distTarget.dist_group
     AND rawExp.filter = distTarget.filter
 JOIN rcInterest USING(target_id)
-LEFT JOIN distRun ON distRun.stage = 'fake' AND (distRun.stage_id = fake_id)
-    AND distRun.clean = distTarget.clean
+LEFT JOIN distRun ON (distRun.stage_id = fake_id)
+    AND distRun.target_id = distTarget.target_id
 WHERE  distTarget.state = 'enabled'
     AND rcInterest.state = 'enabled'