Changeset 21034 for trunk/tools/diff_inputs.pl

Timestamp:

Dec 17, 2008, 3:32:35 PM (17 years ago)

Author:

Paul Price

Message:

Need to do different kind of JOIN following schema change.
Not entirely sure I've got this right, but it works for my
current test case.

File:

• trunk/tools/diff_inputs.pl (modified) (2 diffs)

trunk/tools/diff_inputs.pl

@@ -59 +59 @@
     " FROM diffRun" .
     " JOIN diffInputSkyfile USING(diff_id)" .
-    " JOIN warpSkyfile USING(warp_id, skycell_id)" .
+    " JOIN warpSkyfile" .
+    "     ON warpSkyfile.skycell_id = diffInputSkyfile.skycell_id" .
+    "     AND (warpSkyfile.warp_id = diffInputSkyfile.warp1" .
+    "         OR warpSkyfile.warp_id = diffInputSkyfile.warp2)" .
     " WHERE diff_id = $diff_id";
-$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
+$sql .= " AND diffInputSkyfile.skycell_id = $skycell_id" if defined $skycell_id;
 $sql.= " UNION" .
     " SELECT" .
@@ -68 +71 @@
     " FROM diffRun" .
     " JOIN diffInputSkyfile USING(diff_id)" .
-    " JOIN stackSumSkyfile USING(stack_id)" .
+    " JOIN stackSumSkyfile" .
+    "     ON (stackSumSkyfile.stack_id = diffInputSkyfile.stack1" .
+    "         OR stackSumSkyfile.stack_id = diffInputSkyfile.stack2)" .
     " WHERE diff_id = $diff_id";
-$sql .= " AND skycell_id = $skycell_id" if defined $skycell_id;
+$sql .= " AND diffInputSkyfile.skycell_id = $skycell_id" if defined $skycell_id;