Changeset 1583
- Timestamp:
- 06/03/07 20:39:44 (15 months ago)
- Location:
- trunk/sql/psql
- Files:
-
- 3 modified
-
OMERO3__1__OMERO3__4__A_hibtool.sql (modified) (4 diffs)
-
OMERO3__1__OMERO3__4__B_apg.sql (modified) (5 diffs)
-
OMERO3__1__OMERO3__4__C_enums.sql (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/sql/psql/OMERO3__1__OMERO3__4__A_hibtool.sql
r1562 r1583 1 2 begin; 1 BEGIN; 2 3 -- Manually added items 4 alter table originalfile alter column size type int8; 5 6 -- Items calculated by <schemaupdate/> 3 7 create table binning (id int8 not null, owner_id int8 not null, group_id int8 not null, creation_id int8 not null, permissions int8 not null, external_id int8 unique, value varchar(255) not null unique, primary key (id)); 4 8 create table coating (id int8 not null, owner_id int8 not null, group_id int8 not null, creation_id int8 not null, permissions int8 not null, external_id int8 unique, value varchar(255) not null unique, primary key (id)); … … 47 51 create table projectannotation (id int8 not null, owner_id int8 not null, group_id int8 not null, creation_id int8 not null, update_id int8 not null, permissions int8 not null, external_id int8 unique, version int4 default 0, project int8 not null, content text not null, primary key (id)); 48 52 create table transmittancerange (id int8 not null, owner_id int8 not null, group_id int8 not null, creation_id int8 not null, update_id int8 not null, permissions int8 not null, external_id int8 unique, version int4 default 0, cutIn int4 not null, cutOut int4 not null, cutInTolerance int4, cutOutTolerance int4, transmittance float4 not null, primary key (id)); 49 50 53 alter table binning add constraint FKbinning_owner_id_experimenter foreign key (owner_id) references experimenter; 51 54 alter table binning add constraint FKbinning_creation_id_event foreign key (creation_id) references event; … … 127 130 alter table transmittancerange add constraint FKtransmittancerange_external_id_externalinfo foreign key (external_id) references externalinfo; 128 131 alter table transmittancerange add constraint FKtransmittancerange_group_id_experimentergroup foreign key (group_id) references experimentergroup; 129 130 132 create sequence seq_binning; 131 133 create sequence seq_coating; … … 143 145 create sequence seq_transmittancerange; 144 146 145 commit;147 COMMIT; -
trunk/sql/psql/OMERO3__1__OMERO3__4__B_apg.sql
r1562 r1583 1 BEGIN; 1 2 2 BEGIN; 3 4 ALTER TABLE image 5 DROP CONSTRAINT fkimage_acquisition_objective; 3 -- Calculated by apg_diff 6 4 7 5 ALTER TABLE objective 8 DROP CONSTRAINT fkobjective_aberrationcorrection_aberrationcorrection; 6 DROP COLUMN correctioncollar, 7 DROP COLUMN irisdiaphragm, 8 DROP COLUMN aberrationcorrection, 9 DROP COLUMN immersionmedium, 10 DROP COLUMN phasecondenserannulus, 11 ALTER COLUMN serialnumber DROP NOT NULL; 9 12 10 ALTER TABLE objective11 DROP CONSTRAINT fkobjective_correctioncollar_correctioncollar;12 13 ALTER TABLE objective14 DROP CONSTRAINT fkobjective_immersionmedium_immersionmedium;15 16 ALTER TABLE objective17 DROP CONSTRAINT fkobjective_irisdiaphragm_irisdiaphragm;18 19 ALTER TABLE pixels20 DROP CONSTRAINT fkpixels_acquisitioncontext_acquisitioncontext;21 13 22 14 DROP SEQUENCE seq_acquisitioncontext; … … 38 30 DROP SEQUENCE seq_semiconductorlasermedia; 39 31 40 DROP TABLE acquisitioncontext ;32 DROP TABLE acquisitioncontext CASCADE; 41 33 42 DROP TABLE correctioncollar ;34 DROP TABLE correctioncollar CASCADE; 43 35 44 DROP TABLE dyelaser ;36 DROP TABLE dyelaser CASCADE; 45 37 46 DROP TABLE dyelasermedia ;38 DROP TABLE dyelasermedia CASCADE; 47 39 48 DROP TABLE excimerlaser ;40 DROP TABLE excimerlaser CASCADE; 49 41 50 DROP TABLE excimerlasermedia ;42 DROP TABLE excimerlasermedia CASCADE; 51 43 52 DROP TABLE freeelectronlaser ;44 DROP TABLE freeelectronlaser CASCADE; 53 45 54 DROP TABLE freeelectronlasermedia ;46 DROP TABLE freeelectronlasermedia CASCADE; 55 47 56 DROP TABLE gaslaser ;48 DROP TABLE gaslaser CASCADE; 57 49 58 DROP TABLE gaslasermedia ;50 DROP TABLE gaslasermedia CASCADE; 59 51 60 DROP TABLE immersionmedium ;52 DROP TABLE immersionmedium CASCADE; 61 53 62 DROP TABLE metalvaporlaser ;54 DROP TABLE metalvaporlaser CASCADE; 63 55 64 DROP TABLE metalvaporlasermedia ;56 DROP TABLE metalvaporlasermedia CASCADE; 65 57 66 DROP TABLE semiconductorlaser ;58 DROP TABLE semiconductorlaser CASCADE; 67 59 68 DROP TABLE semiconductorlasermedia ;60 DROP TABLE semiconductorlasermedia CASCADE; 69 61 70 62 ALTER TABLE arc … … 94 86 DROP COLUMN version; 95 87 96 UPDATE event 97 SET permissions = -35 WHERE permissions is null; 98 99 UPDATE eventlog 100 SET permissions = -35 WHERE permissions is null; 101 102 UPDATE experimenter 103 SET permissions = -35 WHERE permissions is null; 88 UPDATE event set permissions = -35; 89 UPDATE eventlog set permissions = -35; 90 UPDATE experimenter set permissions = -35; 104 91 105 92 ALTER TABLE event 106 ALTER COLUMN permissions SET NOT NULL, 107 ALTER COLUMN experimentergroup SET NOT NULL, 108 ALTER COLUMN type SET NOT NULL; 93 ALTER COLUMN permissions SET NOT NULL; 109 94 110 95 ALTER TABLE eventlog … … 137 122 ALTER TABLE microscope 138 123 ALTER COLUMN serialnumber DROP NOT NULL; 139 140 ALTER TABLE objective141 DROP COLUMN immersionmedium,142 DROP COLUMN aberrationcorrection,143 DROP COLUMN correctioncollar,144 DROP COLUMN phasecondenserannulus,145 DROP COLUMN irisdiaphragm,146 ALTER COLUMN serialnumber DROP NOT NULL;147 148 ALTER TABLE originalfile149 ALTER COLUMN size TYPE bigint;150 124 151 125 ALTER TABLE overlay … … 194 168 DROP COLUMN version; 195 169 196 ALTER TABLE dbpatch197 ADD CONSTRAINT unique_dbpatch UNIQUE (currentversion, currentpatch, previousversion, previouspatch);198 199 170 COMMIT; -
trunk/sql/psql/OMERO3__1__OMERO3__4__C_enums.sql
r1562 r1583 1 1 begin; 2 3 -- Calculated by hand 2 4 3 5 insert into binning (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_binning'),-35,0,0,0,'8x8'; … … 33 35 insert into jobstatus (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_jobstatus'),-35,0,0,0,'Error'; 34 36 35 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,' lasermediumeFl';36 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,' lasermediumeCl';37 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,' lasermediumeBr';38 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,' lasermediume';37 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'XeFl'; 38 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'XeCl'; 39 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'XeBr'; 40 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'Xe'; 39 41 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'Rhodamine-5G'; 40 42 insert into lasermedium (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_lasermedium'),-35,0,0,0,'N'; … … 73 75 insert into photometricinterpretation (id,permissions,owner_id,group_id,creation_id,value) select nextval('seq_photometricinterpretation'),-35,0,0,0,'ColorMap'; 74 76 77 alter table dbpatch add constraint unique_dbpatch unique (currentVersion, currentPatch, previousVersion, previousPatch); 78 alter table dbpatch alter id set default nextval('seq_dbpatch'), 79 alter permissions set default -35, 80 alter message set default 'Updating'; 81 update dbpatch set message = 'Updated.', finished = now() 82 where currentVersion = 'OMERO3' and 83 currentPatch = 4 and 84 previousVersion = 'OMERO3' and 85 previousPatch = 1; 75 86 commit;
