Index: /trunk/dbconfig/changes.txt
===================================================================
--- /trunk/dbconfig/changes.txt	(revision 21309)
+++ /trunk/dbconfig/changes.txt	(revision 21310)
@@ -795,2 +795,31 @@
 ALTER TABLE magicInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(magic_id, diff_id, node);
 
+
+
+-- Version: 1.1.48
+
+ALTER TABLE chipProcessedImfile DROP COLUMN chip_image_id;
+ALTER TABLE diffSkyfile DROP COLUMN diff_image_id;
+ALTER TABLE warpSkyfile DROP COLUMN warp_image_id;
+
+ALTER TABLE diffInputSkyfile ADD COLUMN diff_skyfile_id BIGINT AUTO_INCREMENT, ADD KEY(diff_id, skycell_id), ADD KEY(diff_skyfile_id);
+
+CREATE TABLE chipImfile (
+     chip_id BIGINT,
+     class_id VARCHAR(64),
+     chip_imfile_id BIGINT AUTO_INCREMENT,
+     PRIMARY KEY(chip_id, class_id),
+     KEY(chip_imfile_id),
+     FOREIGN KEY (chip_id) REFERENCES  chipRun(chip_id))
+ENGINE=innodb DEFAULT CHARSET=latin1;
+
+CREATE TABLE warpImfile (
+     warp_id BIGINT,
+     skycell_id VARCHAR(64),
+     warp_skyfile_id BIGINT AUTO_INCREMENT,
+     PRIMARY KEY(warp_id, skycell_id),
+     KEY(warp_skyfile_id),
+     FOREIGN KEY (warp_id) REFERENCES  warpRun(warp_id))
+ENGINE=innodb DEFAULT CHARSET=latin1;
+
+
Index: /trunk/dbconfig/chip.md
===================================================================
--- /trunk/dbconfig/chip.md	(revision 21309)
+++ /trunk/dbconfig/chip.md	(revision 21310)
@@ -11,4 +11,10 @@
     tess_id     STR         64
     end_stage   STR         64      # Key
+END
+
+chipImfile METADATA
+    chip_id     S64         0       # Primary Key fkey (chip_id) ref chipRun (chip_id)
+    class_id    STR         64      # Primary Key
+    chip_image_id   S64     0       # Key AUTO_INCREMENT
 END
 
@@ -81,5 +87,4 @@
     path_base       STR     255
     fault           S16     0       # Key NOT NULL
-    chip_image_id   S64     0       # Key AUTO_INCREMENT
     magicked        BOOL    f
 END
Index: /trunk/dbconfig/config.md
===================================================================
--- /trunk/dbconfig/config.md	(revision 21309)
+++ /trunk/dbconfig/config.md	(revision 21310)
@@ -2,4 +2,4 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.47
+    pkg_version     STR     1.1.48
 END
Index: /trunk/dbconfig/diff.md
===================================================================
--- /trunk/dbconfig/diff.md	(revision 21309)
+++ /trunk/dbconfig/diff.md	(revision 21310)
@@ -1,3 +1,3 @@
-# $Id: diff.md,v 1.15 2008-12-13 20:17:34 bills Exp $
+# $Id: diff.md,v 1.16 2009-02-05 19:37:44 bills Exp $
 
 diffRun METADATA
@@ -18,11 +18,12 @@
 
 diffInputSkyfile METADATA
-    diff_id     S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
-    skycell_id  STR         64      # Primary Key
-    warp1       S64         0       # fkey(warp1, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
-    stack1      S64         0       # fkey(stack1) ref stackSumSkyfile(stack_id) 
-    warp2       S64         0       # fkey(warp2, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
-    stack2      S64         0       # fkey(stack2) ref stackSumSkyfile(stack_id) 
-    tess_id     STR         64      # Key
+    diff_id         S64         0       # Primary Key fkey(diff_id) ref diffRun(diff_id)
+    skycell_id      STR         64      # Primary Key
+    warp1           S64         0       # fkey(warp1, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
+    stack1          S64         0       # fkey(stack1) ref stackSumSkyfile(stack_id) 
+    warp2           S64         0       # fkey(warp2, skycell_id, tess_id) ref warpSkyfile(warp_id, skycell_id, tess_id)
+    stack2          S64         0       # fkey(stack2) ref stackSumSkyfile(stack_id) 
+    tess_id         STR         64      # Key
+    diff_skyfile_id S64         0       # Primary Key
 END
 
@@ -52,5 +53,4 @@
     good_frac    F32        0.0     # Key
     fault        S16        0       # Key
-    diff_image_id S64       0       # Key NOT NULL AUTO_INCREMENT
     magicked     BOOL       f
 END
Index: /trunk/dbconfig/warp.md
===================================================================
--- /trunk/dbconfig/warp.md	(revision 21309)
+++ /trunk/dbconfig/warp.md	(revision 21310)
@@ -1,3 +1,3 @@
-# $Id: warp.md,v 1.20 2008-12-13 20:17:34 bills Exp $
+# $Id: warp.md,v 1.21 2009-02-05 19:37:44 bills Exp $
 
 #
@@ -32,4 +32,10 @@
 END
 
+warpImfile METADATA
+    warp_id         S64     0       # Primary Key fkey(warp_id) ref warpRun(warp_id)
+    skycell_id      STR     64      # Primary Key
+    warp_skyfile_id S64     0       # Primary Key AUTO_INCREMENT
+END
+
 warpSkyfile METADATA
     warp_id        S64      0       # Primary Key fkey(warp_id, skycell_id, tess_id) ref warpSkyCellMap(warp_id, skycell_id, tess_id)
@@ -51,5 +57,4 @@
     ignored        BOOL     f       # Key
     fault          S16      0       # Key
-    warp_image_id  S64      0       # Key AUTO_INCREMENT
     magicked       BOOL     f
 END