Changeset 25838

Timestamp:

Oct 14, 2009, 11:36:17 AM (17 years ago)

Author:

bills

Message:

disambiguate field by finishing the join

Location:

trunk/ippTools/share

Files:

• disttool_pending_camera.sql (modified) (1 diff)
• disttool_pending_chip.sql (modified) (2 diffs)
• disttool_pending_diff.sql (modified) (1 diff)
• disttool_pending_fake.sql (modified) (1 diff)
• disttool_pending_raw.sql (modified) (2 diffs)
• disttool_pending_stack.sql (modified) (1 diff)
• disttool_pending_warp.sql (modified) (1 diff)

trunk/ippTools/share/disttool_pending_camera.sql

@@ -17 +17 @@
     chipRun.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN camRun ON camRun.cam_id = distRun.stage_id
 JOIN camProcessedExp USING(cam_id)

trunk/ippTools/share/disttool_pending_chip.sql

@@ -6 +6 @@
     stage_id,
     chipProcessedImfile.class_id AS component,
-    clean,
+    distRun.clean,
     rawExp.camera,
     CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
@@ -17 +17 @@
     chipProcessedImfile.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN chipRun ON chipRun.chip_id = distRun.stage_id
 JOIN rawExp using(exp_id)

trunk/ippTools/share/disttool_pending_diff.sql

@@ -19 +19 @@
     diffSkyfile.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN diffRun ON stage_id = diff_id
 JOIN diffSkyfile using(diff_id)

trunk/ippTools/share/disttool_pending_fake.sql

@@ -17 +17 @@
     0
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN fakeRun ON fakeRun.fake_id = distRun.stage_id
 JOIN fakeProcessedImfile USING(fake_id)

trunk/ippTools/share/disttool_pending_raw.sql

@@ -17 +17 @@
     rawImfile.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN rawExp ON rawExp.exp_id = stage_id
 JOIN rawImfile USING(exp_id)
@@ -52 +52 @@
     rawExp.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN rawExp ON exp_id = stage_id
 LEFT JOIN distComponent 

trunk/ippTools/share/disttool_pending_stack.sql

@@ -19 +19 @@
     0 AS magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN stackRun
     ON stage_id = stack_id

trunk/ippTools/share/disttool_pending_warp.sql

@@ -17 +17 @@
     warpSkyfile.magicked
 FROM distRun
-JOIN distTarget USING(target_id, stage)
+JOIN distTarget USING(target_id, stage, clean)
 JOIN warpRun ON stage_id = warp_id
 JOIN warpSkyfile using(warp_id)