IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 13, 2009, 12:37:33 PM (17 years ago)
Author:
Paul Price
Message:

Merging branches/pap_magic@24173 into trunk. One conflict in dbconfig/changes.txt resolved easily.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/dbconfig/changes.txt

    r24125 r24174  
    11051105ALTER TABLE receiveFileset ADD COLUMN dirinfo VARCHAR(255) AFTER state;
    11061106
     1107-- Playing with the diffs for warp-warp
     1108ALTER TABLE diffRun ADD COLUMN bothways TINYINT DEFAULT 0 AFTER tess_id;
     1109UPDATE diffRun SET bothways = 1 WHERE reduction = 'WARPWARP';
     1110ALTER TABLE diffRun DROP FOREIGN KEY diffRun_ibfk_1;
     1111ALTER TABLE diffRun DROP COLUMN exp_id;
     1112ALTER TABLE diffRun ADD KEY(label);
     1113ALTER TABLE diffRun ADD COLUMN exposure TINYINT DEFAULT 0 AFTER bothways;
     1114UPDATE diffRun, diffInputSkyfile SET diffRun.exposure = 1 WHERE diffRun.diff_id = diffInputSkyfile.diff_id and diffInputSkyfile.warp1 IS NOT NULL;
     1115ALTER TABLE stackRun ADD KEY(label);
     1116
     1117ALTER TABLE magicRun ADD COLUMN inverse TINYINT NOT NULL DEFAULT 0 AFTER diff_id;
     1118ALTER TABLE diffSkyfile DROP COLUMN uri;
     1119
     1120DROP TABLE IF EXISTS magicSkyfileMask;
     1121ALTER TABLE magicInputSkyfile DROP FOREIGN KEY magicInputSkyfile_ibfk_2;
     1122ALTER TABLE magicInputSkyfile DROP KEY diff_id;
     1123ALTER TABLE magicInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(magic_id,node);
     1124ALTER TABLE magicInputSkyfile DROP COLUMN diff_id;
     1125ALTER TABLE magicNodeResult CHANGE COLUMN uri path_base VARCHAR(255);
     1126
     1127-- Version 1.1.53
Note: See TracChangeset for help on using the changeset viewer.