Index: trunk/ippTools/share/magictool_inputs.sql
===================================================================
--- trunk/ippTools/share/magictool_inputs.sql	(revision 20695)
+++ trunk/ippTools/share/magictool_inputs.sql	(revision 20973)
@@ -10,9 +10,10 @@
     diffSkyfile.path_base,
     diffSkyfile.fault
-FROM magicInputSkyfile
+FROM magicRun
+JOIN magicInputSkyfile
+USING(magic_id)
 JOIN diffSkyfile
-    USING(diff_id)
-JOIN magicRun
-    USING(magic_id)
+    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
+    AND magicInputSkyfile.node = diffSkyfile.skycell_id
 UNION
 -- Merged skycells
@@ -21,5 +22,5 @@
     magicRun.state,
     magicTree.node,
-    0,
+    0,   -- no diff_id
     magicNodeResult.uri,
     NULL, -- magicNodeResult doesn't have a path_base