Index: trunk/ippTools/share/magictool_warpskyfile.sql
===================================================================
--- trunk/ippTools/share/magictool_warpskyfile.sql	(revision 20690)
+++ trunk/ippTools/share/magictool_warpskyfile.sql	(revision 20691)
@@ -1,5 +1,5 @@
 SELECT
-    warp_id,
-    skycell_id,
+    warpSkyfile.warp_id,
+    warpSkyfile.skycell_id,
     warpSkyfile.uri,
     warpSkyfile.path_base
@@ -9,9 +9,13 @@
 JOIN diffInputSkyfile
     ON diffInputSkyfile.diff_id = diffRun.diff_id
+    AND diffInputSkyfile.skycell_id = diffRun.skycell_id
     -- Want input warps only
     AND diffInputSkyfile.warp_id IS NOT NULL
     AND diffInputSkyfile.template = 0
-JOIN warpSkyfile USING(warp_id,skycell_id)
-JOIN warpRun USING(warp_id)
+JOIN warpSkyfile
+    ON warpSkyfile.warp_id = diffInputSkyfile.warp_id
+    AND warpSkyfile.skycell_id = diffRun.skycell_id
+JOIN warpRun
+    ON warpRun.warp_id = warpSkyfile.warp_id
 WHERE
     warpRun.state = 'full'