Index: trunk/dbconfig/changes.txt
===================================================================
--- trunk/dbconfig/changes.txt	(revision 16684)
+++ trunk/dbconfig/changes.txt	(revision 16730)
@@ -123,2 +123,18 @@
 drop table pzPendingImfile;
 alter table flatocorrRun add colum region VARCHAR(255) after stats;
+
+### 1.1.31
+
+ALTER TABLE warpRun ADD COLUMN cam_id BIGINT AFTER warp_id;
+ALTER TABLE warpRun ADD KEY(cam_id);
+ALTER TABLE warpRun ADD KEY(warp_id, cam_id);
+ALTER TABLE warpRun ADD CONSTRAINT FOREIGN KEY(cam_id) REFERENCES
+camRun(cam_id);
+ALTER TABLE warpRun ADD COLUMN magiced TINYINT AFTER registered;
+ALTER TABLE warpSkyCellMap DROP FOREIGN KEY warpSkyCellMap_ibfk_1;
+UPDATE warpRun JOIN warpInputExp USING(warp_id) SET warpRun.cam_id =
+warpInputExp.cam_id WHERE warpRun.warp_id = warpInputExp.warp_id;
+ALTER TABLE warpSkyCellMap ADD CONSTRAINT FOREIGN KEY(warp_id, cam_id)
+REFERENCES warpRun(warp_id, cam_id);
+DROP TABLE warpInputExp;
+
Index: trunk/dbconfig/config.md
===================================================================
--- trunk/dbconfig/config.md	(revision 16684)
+++ trunk/dbconfig/config.md	(revision 16730)
@@ -2,4 +2,4 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.30
+    pkg_version     STR     1.1.31
 END
Index: trunk/dbconfig/warp.md
===================================================================
--- trunk/dbconfig/warp.md	(revision 16684)
+++ trunk/dbconfig/warp.md	(revision 16730)
@@ -1,3 +1,3 @@
-# $Id: warp.md,v 1.12 2008-01-26 04:24:33 eugene Exp $
+# $Id: warp.md,v 1.13 2008-02-29 01:03:17 jhoblitt Exp $
 
 #
@@ -11,4 +11,5 @@
 warpRun METADATA
     warp_id     S64         0       # Primary Key AUTO_INCREMENT
+    cam_id      S64         0       # Key INDEX(warp_id, cam_id) fkey(cam_id) ref camProcessedExp(cam_id)
     mode        STR         64      # Key
     state       STR         64      # Key
@@ -19,15 +20,4 @@
     end_stage   STR         64      # Key
     registered  TAI         NULL
-END
-
-#
-# Warp to Sky Cell Mode
-#
-
-# the list of imfiles in our skycell keyed against phase 3
-# only allow one cam_version of an exp_id per warpRun
-warpInputExp METADATA
-    warp_id     S64         0       # Primary Key fkey(warp_id) ref warpRun(warp_id)
-    cam_id      S64         0       # Primary Key fkey(cam_id) ref camProcessedExp(cam_id)
 # if magic is T then look for the exp_id in the magic output tables
     magiced     BOOL        f       # Key
@@ -35,5 +25,5 @@
 
 warpSkyCellMap METADATA
-    warp_id     S64         0       # Primary Key fkey(warp_id, cam_id) ref warpInputExp(warp_id, cam_id)
+    warp_id     S64         0       # Primary Key fkey(warp_id, cam_id) ref warpRun(warp_id, cam_id)
     skycell_id  STR         64      # Primary Key
     tess_id     STR         64      # Primary Key