diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.10.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.20.sql
similarity index 92%
rename from ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.10.sql
rename to ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.20.sql
index 9c8ee3757..b0d9d1b92 100644
--- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.10.sql
+++ b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.00-18.20.sql
@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
  */
 
-/* EHR_Lookups-11.10-11.101.sql */
+/* EHR_Lookups-11.10-11.20.sql */
 
 CREATE SCHEMA ehr_lookups;
 
@@ -4627,8 +4627,6 @@ VALUES
 ('>')
 ;
 
-/* EHR_Lookups-11.101-11.102.sql */
-
 INSERT INTO ehr_lookups.blood_draw_services
 (service) VALUES
 ('Vet-19')
@@ -4647,8 +4645,6 @@ WITH (OIDS=FALSE)
 
 ;
 
-/* EHR_Lookups-11.102-11.103.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.problem_list_category;
 CREATE TABLE ehr_lookups.problem_list_category (
 category varchar(200),
@@ -4678,8 +4674,6 @@ insert into ehr_lookups.encounter_types
 ('Procedure - Training')
 ;
 
-/* EHR_Lookups-11.103-11.104.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.blood_billed_by;
 CREATE TABLE ehr_lookups.blood_billed_by (
 code varchar(200),
@@ -4720,8 +4714,6 @@ INSERT INTO ehr_lookups.housing_reason
 ('Other')
 ;
 
-/* EHR_Lookups-11.104-11.106.sql */
-
 DELETE from ehr_lookups.cageclass;
 
 INSERT INTO ehr_lookups.cageclass
@@ -4820,15 +4812,11 @@ VALUES
 ('Vervet', 0, 20)
 ;
 
-/* EHR_Lookups-11.106-11.107.sql */
-
 -- ----------------------------
 -- Records of tb_result
 -- ----------------------------
 INSERT INTO ehr_lookups.tb_result VALUES ('-');
 
-/* EHR_Lookups-11.107-11.108.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.procedures;
 CREATE TABLE ehr_lookups.procedures (
 rowid SERIAL,
@@ -4844,8 +4832,6 @@ WITH (OIDS=FALSE)
 
 INSERT INTO ehr_lookups.encounter_types VALUES ('Biopsy');
 
-/* EHR_Lookups-11.109-11.110.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.treatment_frequency;
 CREATE TABLE ehr_lookups.treatment_frequency (
 RowId serial NOT NULL,
@@ -4872,11 +4858,8 @@ VALUES
 (9, 'Alternating Days', 9)
 ;
 
-/* EHR_Lookups-11.110-11.111.sql */
-
 DELETE FROM ehr_lookups.blood_draw_tube_type WHERE type = 'Other';
 
-
 -- ----------------------------
 -- Table structure for ehr_lookups.death_cause
 -- ----------------------------
@@ -4902,8 +4885,6 @@ INSERT INTO ehr_lookups.death_cause
 ('Quarantine')
 ;
 
-/* EHR_Lookups-11.111-11.112.sql */
-
 ALTER TABLE ehr_lookups.cage
   ADD column canJoinToNeighbor bool
 ;
@@ -4930,8 +4911,6 @@ INSERT INTO ehr_lookups.calculated_status_codes
  ('ERROR')
  ;
 
-/* EHR_Lookups-11.112-11.113.sql */
-
 ALTER TABLE ehr_lookups.cage
   drop column canJoinToNeighbor
 ;
@@ -4940,8 +4919,6 @@ ALTER TABLE ehr_lookups.cage
   ADD column joinToCage varchar(50)
 ;
 
-/* EHR_Lookups-11.114-11.115.sql */
-
 -- ----------------------------
 -- Table structure for histology_stain
 -- ----------------------------
@@ -5022,8 +4999,6 @@ VALUES
 ('Urinalysis', 'Urinalysis', 'Urinalysis Results', '', '')
 ;
 
-/* EHR_Lookups-11.115-11.116.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.qualitative_results;
 CREATE TABLE ehr_lookups.qualitative_results (
 result varchar(255) not null,
@@ -5081,14 +5056,10 @@ WITH (OIDS=FALSE)
 
 ;
 
-/* EHR_Lookups-11.116-11.117.sql */
-
 UPDATE ehr_lookups.cageclass
 set sqft = 1.6
 WHERE low=0 AND high=1.5 ;
 
-/* EHR_Lookups-11.117-11.118.sql */
-
 UPDATE ehr_lookups.arearooms
 SET area = 'AB-Old'
 WHERE area = 'SPF';
@@ -5106,8 +5077,6 @@ UPDATE ehr_lookups.areas
 set area = 'AB-New'
 WHERE area = 'NSPF';
 
-/* EHR_Lookups-11.118-11.119.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.treatment_codes;
 CREATE TABLE ehr_lookups.treatment_codes (
   meaning varchar(250) not null,
@@ -5126,16 +5095,12 @@ CREATE TABLE ehr_lookups.treatment_codes (
   CONSTRAINT PK_treatment_codes PRIMARY KEY (meaning)
 );
 
-/* EHR_Lookups-11.119-11.120.sql */
-
 INSERT INTO ehr_lookups.condition_codes
 (code, meaning) VALUES
 ('gaf', 'in a group with adopted father'),
 ('mgaf', 'in a group with mother and adopted father')
 ;
 
-/* EHR_Lookups-11.120-11.121.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.tissue_recipients;
 CREATE TABLE ehr_lookups.tissue_recipients (
 recipient varchar(255) not null,
@@ -5186,8 +5151,6 @@ INSERT INTO ehr_lookups.blood_draw_services
 ('Viral Load')
 ;
 
-/* EHR_Lookups-11.121-11.122.sql */
-
 -- ----------------------------
 -- Table structure for blood_draw_tube_type
 -- ----------------------------
@@ -5212,8 +5175,6 @@ VALUES
 ('Heparin')
 ;
 
-/* EHR_Lookups-11.122-11.123.sql */
-
 delete from ehr_lookups.dental_priority ;
 
 INSERT INTO ehr_lookups.dental_priority
@@ -5327,8 +5288,6 @@ INSERT INTO ehr_lookups.clinpath_tests
 ('GIFN for TB detection', 'Bacteriology')
 ;
 
-/* EHR_Lookups-11.123-11.124.sql */
-
 INSERT INTO ehr_lookups.clinpath_tests
 (testname, dataset) VALUES
 ('Occult Blood', 'Parasitology'),
@@ -5336,8 +5295,6 @@ INSERT INTO ehr_lookups.clinpath_tests
 ('PCR - Individual Bacterium', 'Bacteriology')
 ;
 
-/* EHR_Lookups-11.124-11.125.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.clinpath_types;
 CREATE TABLE ehr_lookups.clinpath_types (
 type varchar(255) not null,
@@ -5359,8 +5316,6 @@ INSERT INTO ehr_lookups.clinpath_types
 ('Virology')
 ;
 
-/* EHR_Lookups-11.125-11.126.sql */
-
 DELETE FROM ehr_lookups.clinpath_collection_method
 WHERE method like '%Biopsy%';
 
@@ -5371,9 +5326,6 @@ INSERT INTO ehr_lookups.clinpath_collection_method
 ('Biopsy, needle (true cut)')
 ;
 
-
-
-
 DELETE FROM ehr_lookups.clinpath_sampletype;
 
 INSERT INTO ehr_lookups.clinpath_sampletype
@@ -5405,8 +5357,6 @@ INSERT INTO ehr_lookups.clinpath_sampletype
 
 drop table ehr_lookups.clinpath_services;
 
-/* EHR_Lookups-11.126-11.127.sql */
-
 INSERT INTO ehr_lookups.pe_region
 (region)
 VALUES
@@ -5418,8 +5368,6 @@ VALUES
 ('Digits')
 ;
 
-/* EHR_Lookups-11.127-11.128.sql */
-
 INSERT INTO ehr_lookups.clinpath_collection_method
 (method) VALUES
 ('Cystocentesis'),
@@ -5434,8 +5382,6 @@ VALUES
 ('Osmolarity', 'Chemistry');
 ;
 
-/* EHR_Lookups-11.128-11.129.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.urinalysis_qualitative_results;
 CREATE TABLE ehr_lookups.urinalysis_qualitative_results (
 result varchar(255) not null,
@@ -5460,8 +5406,6 @@ INSERT INTO ehr_lookups.urinalysis_qualitative_results
 ('Flocc.')
 ;
 
-/* EHR_Lookups-11.129-11.130.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.blood_tube_volumes;
 CREATE TABLE ehr_lookups.blood_tube_volumes (
 volume float,
@@ -5483,8 +5427,6 @@ INSERT INTO ehr_lookups.blood_tube_volumes
 ('EDTA,Heparin', 6)
 ;
 
-/* EHR_Lookups-11.130-11.131.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.tattoo_status;
 CREATE TABLE ehr_lookups.tattoo_status (
 status varchar(100),
@@ -5527,16 +5469,12 @@ INSERT INTO ehr_lookups.encounter_types
 ('Pre-assignment Physical Exam and TB Test')
 ;
 
-/* EHR_Lookups-11.131-11.132.sql */
-
 INSERT INTO ehr_lookups.amount_units VALUES ('ounces');
 
 ALTER table ehr_lookups.treatment_codes
   add column qualifier varchar(200)
   ;
 
-/* EHR_Lookups-11.132-11.133.sql */
-
 alter table ehr_lookups.dosage_units
   add column denominator varchar(20)
   ;
@@ -5652,8 +5590,6 @@ values
 ('Hormone' ,'Insulin-NPH-Humulin N' ,'c-a2220' ,'' ,'IM' , null,'', null, '', null, '', null, '', '')
 ;
 
-/* EHR_Lookups-11.133-11.134.sql */
-
 DELETE FROM ehr_lookups.clinpath_sampletype;
 
 INSERT INTO ehr_lookups.clinpath_sampletype
@@ -5683,11 +5619,8 @@ INSERT INTO ehr_lookups.clinpath_sampletype
 ('Wound/abscess (list tissue/location)')
 ;
 
-
 update ehr_lookups.gender_codes set meaning = 'female' where meaning = 'Female';
 
-/* EHR_Lookups-11.134-11.135.sql */
-
 INSERT INTO ehr_lookups.dental_jaw VALUES ('Both');
 INSERT INTO ehr_lookups.dental_side VALUES ('Both');
 INSERT INTO ehr_lookups.dental_status VALUES ('Pulpotomized');
@@ -5916,8 +5849,6 @@ insert into ehr_lookups.preservation_solutions
 ('Fresh')
 ;
 
-/* EHR_Lookups-11.135-11.136.sql */
-
 DELETE FROM ehr_lookups.treatment_codes;
 
 INSERT INTO ehr_lookups.treatment_codes
@@ -6024,12 +5955,9 @@ values
 INSERT INTO ehr_lookups.volume_units VALUES ('cup');
 INSERT INTO ehr_lookups.volume_units VALUES ('ounce(s)');
 
-/* EHR_Lookups-11.136-11.137.sql */
-
 delete from ehr_lookups.dental_gingivitis where result = 'No';
 INSERT INTO ehr_lookups.dental_gingivitis VALUES ('None', 1);
 
-
 DROP TABLE IF EXISTS ehr_lookups.virology_method;
 CREATE TABLE ehr_lookups.virology_method (
   method varchar(255) NOT NULL,
@@ -6211,8 +6139,6 @@ INSERT INTO ehr_lookups.hematology_tests VALUES ('GLOB', 'Globulin', 'g/dL');
 INSERT INTO ehr_lookups.hematology_tests VALUES ('GLYCOSYLATED HGB', 'GLYCOSYLATED HGB', '');
 INSERT INTO ehr_lookups.hematology_tests VALUES ('HCT', 'Hematocrit', '%');
 
-/* EHR_Lookups-11.137-11.138.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.booleanCombo;
 
 CREATE TABLE ehr_lookups.booleanCombo
@@ -6232,8 +6158,6 @@ insert into ehr_lookups.booleanCombo
 (false, 'No')
 ;
 
-/* EHR_Lookups-11.138-11.139.sql */
-
 alter table ehr_lookups.treatment_codes
   drop column frequency
   ;
@@ -6345,8 +6269,6 @@ values
 ('Miscellaneous' ,'Water' ,'c-10120' ,'' ,'' , null,'', null, '', null, '', null, '', null)
 ;
 
-/* EHR_Lookups-11.139-11.140.sql */
-
 DELETE FROM ehr_lookups.death_cause;
 
 INSERT INTO ehr_lookups.death_cause
@@ -6394,8 +6316,6 @@ values
 ('GI' ,'Inulin (Fiber Bites)' ,'r-f94e9' ,'' ,'oral' ,2 ,'g/piece', null, null, 1, 'piece(s)', 2, 'g', 1)
 ;
 
-/* EHR_Lookups-11.140-11.141.sql */
-
 -- ----------------------------
 -- Table structure for snomed_subsets
 -- ----------------------------
@@ -6415,8 +6335,6 @@ WITH (OIDS=FALSE)
 
 ;
 
-/* EHR_Lookups-11.141-11.142.sql */
-
 DELETE FROM ehr_lookups.clinpath_sampletype;
 
 INSERT INTO ehr_lookups.clinpath_sampletype
@@ -6470,8 +6388,6 @@ INSERT INTO ehr_lookups.biopsy_type VALUES ('Experimental');
 delete from ehr_lookups.death_manner where manner='Died during experimental procedure';
 INSERT INTO ehr_lookups.death_manner (manner) VALUES ('Died during experimental procedure');
 
-/* EHR_Lookups-11.142-11.143.sql */
-
 DROP TABLE IF EXISTS ehr_lookups.treatment_frequency;
 CREATE TABLE ehr_lookups.treatment_frequency (
 RowId serial NOT NULL,
@@ -6544,32 +6460,24 @@ INSERT INTO ehr_lookups.blood_tube_volumes
 ('EDTA', 3)
 ;
 
-/* EHR_Lookups-11.143-11.144.sql */
-
 INSERT INTO ehr_lookups.condition_codes VALUES ('gb', 'group breeding');
 
-
 delete from ehr_lookups.dental_gingivitis where result = 'Not Recorded';
 INSERT INTO ehr_lookups.dental_gingivitis VALUES ('Not Recorded', 1);
 
-
 delete from ehr_lookups.dental_tartar where result = 'Not Recorded';
 INSERT INTO ehr_lookups.dental_tartar VALUES ('Not Recorded');
 
-
 update ehr_lookups.blood_billed_by set title = 'SPI' where code = 'c';
 
 delete from ehr_lookups.bcs_score where score = '3.5';
 INSERT INTO ehr_lookups.bcs_score VALUES ('3.5', 'Slightly Overweight', null);
 
-/* EHR_Lookups-11.144-11.145.sql */
-
 delete from ehr_lookups.encounter_types where type = 'Procedure - Clinical';
 delete from ehr_lookups.encounter_types where type = 'Procedure - Training';
 delete from ehr_lookups.encounter_types where type = 'Procedure - Experimental';
 delete from ehr_lookups.encounter_types where type = 'Procedure - Other';
 
-
 insert into ehr_lookups.encounter_types
 (type) values
 ('Procedure')
@@ -6598,8 +6506,6 @@ INSERT INTO ehr_lookups.restraint_type (type, code, include) VALUES ('Squeeze Ba
 INSERT INTO ehr_lookups.restraint_type (type, code, include) VALUES ('Manual', null, false);
 INSERT INTO ehr_lookups.restraint_type (type, code, include) VALUES ('Chemical', null, false);
 
-/* EHR_Lookups-11.145-11.146.sql */
-
 update ehr_lookups.conc_units set numerator = 'mL'
 where unit = 'g/mL'
 ;
@@ -7583,7 +7489,7 @@ CREATE TABLE ehr_lookups.procedure_default_treatments (
   CONSTRAINT PK_procedure_default_treatments PRIMARY KEY (rowid)
 );
 
-/* EHR_Lookups-12.30-12.301.sql */
+/* EHR_Lookups-12.30-16.20.sql */
 
 CREATE TABLE ehr_lookups.procedure_default_comments (
   rowid serial,
@@ -7640,8 +7546,6 @@ INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-YYY40',
 INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-721X0', 'E-YY270');
 INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-721X0', 'E-72170');
 
-/* EHR_Lookups-12.301-12.302.sql */
-
 ALTER TABLE ehr_lookups.procedure_default_charges drop Column quantity;
 ALTER TABLE ehr_lookups.procedure_default_charges ADD quantity double precision;
 
@@ -7666,8 +7570,6 @@ CREATE TABLE ehr_lookups.locations (
   CONSTRAINT pk_locations PRIMARY KEY (location)
 );
 
-/* EHR_Lookups-12.302-12.303.sql */
-
 CREATE TABLE ehr_lookups.billingTypes (
   rowid serial,
   name varchar(100),
@@ -7682,8 +7584,6 @@ INSERT INTO ehr_lookups.billingTypes (name) VALUES ('Non-Center Staff');
 ALTER TABLE ehr_lookups.species ADD blood_vol_multiplier double precision;
 UPDATE ehr_lookups.species set blood_vol_multiplier = 0.1;
 
-/* EHR_Lookups-12.305-12.306.sql */
-
 ALTER TABLE ehr_lookups.species DROP COLUMN blood_vol_multiplier;
 ALTER TABLE ehr_lookups.species ADD blood_per_kg double precision;
 ALTER TABLE ehr_lookups.species ADD max_draw_pct double precision;
@@ -7697,8 +7597,6 @@ UPDATE ehr_lookups.species set max_draw_pct = 0.15 WHERE common = 'Marmoset';
 
 DROP TABLE ehr_lookups.account_tiers;
 
-/* EHR_Lookups-12.306-12.307.sql */
-
 CREATE TABLE ehr_lookups.animal_condition (
   code integer,
   meaning varchar(100),
@@ -7728,31 +7626,21 @@ CREATE TABLE ehr_lookups.rooms (
 
 ALTER TABLE ehr_lookups.cage rename roomcage to location;
 
-/* EHR_Lookups-12.307-12.308.sql */
-
 ALTER TABLE ehr_lookups.rooms ADD housingType int;
 ALTER TABLE ehr_lookups.rooms ADD housingCondition int;
 
 DROP TABLE ehr_lookups.locations;
 
-/* EHR_Lookups-12.308-12.309.sql */
-
 alter table ehr_lookups.cage alter column room TYPE varchar(200);
 alter table ehr_lookups.cage alter column cage TYPE varchar(200);
 
-/* EHR_Lookups-12.309-12.310.sql */
-
 insert into ehr_lookups.encounter_types (type) values ('Diagnosis');
 insert into ehr_lookups.routes (route) values ('PO');
 
-/* EHR_Lookups-12.310-12.311.sql */
-
 alter table ehr_lookups.rooms add column dateDisabled timestamp;
 alter table ehr_lookups.rooms drop column category;
 alter table ehr_lookups.areas add column dateDisabled timestamp;
 
-/* EHR_Lookups-12.311-12.312.sql */
-
 ALTER TABLE ehr_lookups.cage add divider int;
 ALTER TABLE ehr_lookups.cage add cage_type varchar(100);
 
@@ -7770,8 +7658,6 @@ CREATE TABLE ehr_lookups.lookup_sets (
   description varchar(4000)
 );
 
-/* EHR_Lookups-12.312-12.313.sql */
-
 ALTER TABLE ehr_lookups.lookup_sets ADD keyField varchar(100);
 ALTER TABLE ehr_lookups.lookup_sets ADD titleColumn varchar(100);
 
@@ -7781,8 +7667,6 @@ DROP table ehr_lookups.integers;
 DROP table ehr_lookups.arearooms;
 DROP TABLE ehr_lookups.mhc_institutions;
 
-/* EHR_Lookups-12.313-12.314.sql */
-
 --alopecia cause
 INSERT INTO ehr_lookups.lookup_sets (setname, label, keyField)
 VALUES ('alopecia_cause', 'Alopecia Cause', 'value');
@@ -8887,12 +8771,8 @@ FROM ehr_lookups.condition_codes;
 
 DROP TABLE ehr_lookups.condition_codes;
 
-/* EHR_Lookups-12.314-12.315.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD countAsPaired boolean default false;
 
-/* EHR_Lookups-12.318-12.319.sql */
-
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Antibiotic Sensitivity');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Biochemistry');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Cerebral Spinal Fluid');
@@ -8900,8 +8780,6 @@ INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Mic
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Occult Blood');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Serology');
 
-/* EHR_Lookups-12.319-12.320.sql */
-
 CREATE TABLE ehr_lookups.parentageTypes (
   label varchar(200),
   priority int,
@@ -8917,16 +8795,10 @@ CREATE TABLE ehr_lookups.relationshipTypes (
   gender varchar(100)
 );
 
-/* EHR_Lookups-12.320-12.321.sql */
-
 ALTER TABLE ehr_lookups.ageclass add label varchar(100);
 
-/* EHR_Lookups-12.323-12.324.sql */
-
 ALTER TABLE ehr_lookups.cage_type DROP COLUMN MaxAnimalWeight;
 
-/* EHR_Lookups-12.326-12.327.sql */
-
 CREATE TABLE ehr_lookups.labwork_types (
   type varchar(100) NOT NULL,
   tableName varchar(100),
@@ -9002,8 +8874,6 @@ INSERT INTO ehr_lookups.labwork_types (type, tablename) VALUES ('iStat', 'istat_
 
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'iSTAT');
 
-/* EHR_Lookups-12.328-12.329.sql */
-
 CREATE TABLE ehr_lookups.cage_positions (
   cage varchar(100) NOT NULL,
   row varchar(100),
@@ -9153,8 +9023,6 @@ INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S2', 'S',
 INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S3', 'S', 3);
 INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S4', 'S', 4);
 
-/* EHR_Lookups-12.333-12.334.sql */
-
 ALTER TABLE ehr_lookups.ageclass ADD gender varchar(100);
 
 ALTER TABLE ehr_lookups.cage_positions ADD sort_order int;
@@ -9301,8 +9169,6 @@ UPDATE ehr_lookups.cage_positions SET sort_order=138 WHERE cage='S2';
 UPDATE ehr_lookups.cage_positions SET sort_order=139 WHERE cage='S3';
 UPDATE ehr_lookups.cage_positions SET sort_order=140 WHERE cage='S4';
 
-/* EHR_Lookups-12.336-12.337.sql */
-
 CREATE TABLE ehr_lookups.flag_categories (
   category varchar(100),
   description varchar(4000),
@@ -9323,23 +9189,15 @@ INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('SPF',
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('TB', false);
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('TMB', false);
 
-/* EHR_Lookups-12.337-12.338.sql */
-
 --implemented based on SQLServer database engine tuning monitor
 CREATE INDEX cage_cagetype_room_cage ON ehr_lookups.cage (cage_type, room, cage);
 CREATE INDEX cage_cagetype_room_cage_divider_type ON ehr_lookups.cage (room, cage, divider, cage_type);
 
-/* EHR_Lookups-12.338-12.339.sql */
-
 --implemented based on SQLServer database engine tuning monitor
 CREATE INDEX rooms_room_area ON ehr_lookups.rooms (room, area);
 
-/* EHR_Lookups-12.339-12.340.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD displaychar varchar(10);
 
-/* EHR_Lookups-12.340-12.341.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD bgcolor varchar(100);
 ALTER TABLE ehr_lookups.divider_types ADD border_style varchar(100);
 ALTER TABLE ehr_lookups.divider_types ADD short_description varchar(100);
@@ -9369,29 +9227,16 @@ UPDATE ehr_lookups.divider_types SET border_style = 'solid' WHERE divider = 'Pai
 UPDATE ehr_lookups.divider_types SET short_description = 'MESH' WHERE divider = 'Pairing Mesh Divider';
 UPDATE ehr_lookups.divider_types SET displaychar = '#' WHERE divider = 'Pairing Mesh Divider';
 
-/* EHR_Lookups-12.342-12.343.sql */
-
 CREATE INDEX rooms_sort_order_room ON ehr_lookups.rooms (sort_order, room);
 
 --NOTE: this is different than the SQLServer version
 CREATE INDEX cage_location ON ehr_lookups.cage (location);
 
-/* EHR_Lookups-12.343-12.344.sql */
-
---NOTE: this is a placeholder b/c an index is created for SQLServer on snomed that isnt supported in PG
-;
-
-/* EHR_Lookups-12.347-12.348.sql */
-
 ALTER TABLE ehr_lookups.species add dateDisabled timestamp;
 
-/* EHR_Lookups-12.348-12.349.sql */
-
 DELETE FROM ehr_lookups.snomed_subsets WHERE subset = 'Diet';
 INSERT INTO ehr_lookups.snomed_subsets (subset) VALUES ('Diet');
 
-/* EHR_Lookups-12.349-12.350.sql */
-
 ALTER TABLE ehr_lookups.flag_categories ADD omitFromOverview bool default false;
 ALTER TABLE ehr_lookups.flag_categories ADD doHighlight bool default false;
 
@@ -9399,8 +9244,6 @@ INSERT INTO ehr_lookups.flag_categories (category, enforceUnique, omitFromOvervi
 UPDATE ehr_lookups.flag_categories set doHighlight = false;
 UPDATE ehr_lookups.flag_categories set doHighlight = true WHERE category = 'Alert';
 
-/* EHR_Lookups-12.351-12.352.sql */
-
 ALTER TABLE ehr_lookups.procedures ADD genericName varchar(200);
 ALTER TABLE ehr_lookups.procedures ADD incision bool default false;
 ALTER TABLE ehr_lookups.procedures ADD recoveryDays integer;
@@ -9409,14 +9252,10 @@ ALTER TABLE ehr_lookups.procedures ADD followupDays integer;
 ALTER TABLE ehr_lookups.procedures ADD analgesiaRx integer;
 ALTER TABLE ehr_lookups.procedures ADD antibioticRx integer;
 
-/* EHR_Lookups-12.352-12.353.sql */
-
 ALTER TABLE ehr_lookups.cage_type ADD verticalSlots integer;
 UPDATE ehr_lookups.cage_type SET verticalSlots = 1;
 UPDATE ehr_lookups.cage_type SET verticalSlots = 2 WHERE cagetype LIKE 'Tunnel - %';
 
-/* EHR_Lookups-12.353-12.354.sql */
-
 ALTER TABLE ehr_lookups.cage_type ADD supportsTunnel bool;
 UPDATE ehr_lookups.cage_type SET supportsTunnel = false;
 UPDATE ehr_lookups.cage_type SET supportsTunnel = true WHERE cagetype LIKE 'Tunnel - %';
@@ -9424,8 +9263,6 @@ ALTER TABLE ehr_lookups.cage_type DROP COLUMN CageCapacity;
 
 ALTER TABLE ehr_lookups.cage ADD hasTunnel bool;
 
-/* EHR_Lookups-12.354-12.355.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_tube_type ADD color varchar(100);
 
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Purple' WHERE type = 'EDTA';
@@ -9433,16 +9270,12 @@ UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Green' WHERE type = 'Hepari
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Red' WHERE type = 'No Additive';
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Striped' WHERE type = 'SST';
 
-/* EHR_Lookups-12.355-12.356.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_services ADD requiredtubetype varchar(100);
 ALTER TABLE ehr_lookups.blood_draw_services ADD minvolume double precision;
 
 UPDATE ehr_lookups.blood_draw_services SET requiredtubetype = 'EDTA' WHERE service = 'CBC';
 UPDATE ehr_lookups.blood_draw_services SET requiredtubetype = 'SST' WHERE service = 'Vet-19';
 
-/* EHR_Lookups-12.357-12.358.sql */
-
 CREATE TABLE ehr_lookups.labwork_services (
   servicename varchar(200),
   dataset varchar(200),
@@ -9472,13 +9305,9 @@ ALTER TABLE ehr_lookups.request_priority ADD immediatenotification bool;
 UPDATE ehr_lookups.request_priority SET immediatenotification = false;
 UPDATE ehr_lookups.request_priority SET immediatenotification = true WHERE priority = 'ASAP';
 
-/* EHR_Lookups-12.360-12.361.sql */
-
 ALTER TABLE ehr_lookups.labwork_panels ADD method varchar(200);
 ALTER TABLE ehr_lookups.labwork_panels ADD testfieldname varchar(200);
 
-/* EHR_Lookups-12.362-12.363.sql */
-
 ALTER TABLE ehr_lookups.procedure_default_treatments rename column concentration_units to conc_units;
 
 ALTER TABLE ehr_lookups.procedure_default_treatments rename column volume_units to vol_units;
@@ -9489,8 +9318,6 @@ UPDATE ehr_lookups.procedure_default_treatments set dosage = null;
 UPDATE ehr_lookups.procedure_default_treatments set amount_units = dosage_units;
 UPDATE ehr_lookups.procedure_default_treatments set dosage_units = null;
 
-/* EHR_Lookups-12.365-12.366.sql */
-
 ALTER TABLE ehr_lookups.snomed_subsets ADD container entityid;
 ALTER TABLE ehr_lookups.snomed_subsets ADD rowid serial;
 
@@ -9503,12 +9330,8 @@ DELETE FROM ehr_lookups.snomed_subsets WHERE container IS NULL;
 
 INSERT INTO ehr_lookups.labwork_types (type, tablename) VALUES ('Misc Tests', 'misc_tests');
 
-/* EHR_Lookups-12.366-12.367.sql */
-
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('Cage Exemptions', true);
 
-/* EHR_Lookups-12.367-12.368.sql */
-
 ALTER TABLE ehr_lookups.labwork_services DROP column sampletype;
 ALTER TABLE ehr_lookups.labwork_services ADD tissue varchar(100);
 
@@ -9516,42 +9339,28 @@ ALTER TABLE ehr_lookups.cageclass ADD requirementset varchar(200);
 
 UPDATE ehr_lookups.cageclass SET requirementset = 'The Guide';
 
-/* EHR_Lookups-12.368-12.369.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD outsidelab bool default false;
 
-/* EHR_Lookups-12.369-12.370.sql */
-
 ALTER TABLE ehr_lookups.snomed ADD container ENTITYID;
 
 --upgrade path for WNPRC
 UPDATE ehr_lookups.snomed SET container = (SELECT c.entityid from core.containers c LEFT JOIN core.Containers c2 on (c.Parent = c2.EntityId) WHERE c.name = 'EHR' and c2.name = 'WNPRC');
 
-/* EHR_Lookups-12.370-12.371.sql */
-
 SELECT core.fn_dropifexists('snomed', 'ehr_lookups', 'CONSTRAINT', 'PK_snomed');
 ALTER TABLE ehr_lookups.snomed ADD rowid SERIAL;
 
 ALTER TABLE ehr_lookups.snomed ADD CONSTRAINT pk_snomed PRIMARY KEY (rowid);
 
-/* EHR_Lookups-12.374-12.375.sql */
-
 CREATE INDEX snomed_code_container ON ehr_lookups.snomed (code, container);
 CREATE INDEX snomed_subset_codes_container_code ON ehr_lookups.snomed_subset_codes (container, code);
 CREATE INDEX snomed_subset_codes_container_primarycategory ON ehr_lookups.snomed_subset_codes (container, primarycategory);
 
-/* EHR_Lookups-12.375-12.376.sql */
-
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique, doHighlight) VALUES ('Assign Alias', true, true);
 
-/* EHR_Lookups-12.377-12.378.sql */
-
 ALTER TABLE ehr_lookups.procedures ADD remark varchar(8000);
 
 ALTER TABLE ehr_lookups.species ADD cites_code varchar(200);
 
-/* EHR_Lookups-12.380-12.381.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults ADD route varchar(100);
 ALTER TABLE ehr_lookups.drug_defaults ADD frequency int;
 ALTER TABLE ehr_lookups.drug_defaults ADD volume double precision;
@@ -9562,61 +9371,41 @@ ALTER TABLE ehr_lookups.drug_defaults ADD amount_units varchar(100);
 ALTER TABLE ehr_lookups.drug_defaults ADD duration double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD "offset" double precision;
 
-/* EHR_Lookups-12.382-12.383.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults add rowid serial;
 ALTER TABLE ehr_lookups.drug_defaults add ageclass varchar(100);
 
 ALTER TABLE ehr_lookups.drug_defaults DROP CONSTRAINT PK_drug_defaults;
 ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT PK_drug_defaults PRIMARY KEY (rowid);
 
-/* EHR_Lookups-12.383-12.384.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_services add formtype varchar(100);
 ALTER TABLE ehr_lookups.blood_draw_services add labwork_service varchar(100);
 
 UPDATE ehr_lookups.blood_draw_services SET formtype = 'Clinpath Request';
 UPDATE ehr_lookups.blood_draw_services SET labwork_service = service;
 
-/* EHR_Lookups-12.389-12.390.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults ADD category varchar(100);
 ALTER TABLE ehr_lookups.drug_defaults ADD volume_rounding double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD amount_rounding double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD amount_max double precision;
 
-/* EHR_Lookups-12.390-12.391.sql */
-
 ALTER TABLE ehr_lookups.procedures DROP COLUMN analgesiaRx;
 ALTER TABLE ehr_lookups.procedures DROP COLUMN antibioticRx;
 
 ALTER TABLE ehr_lookups.procedures ADD analgesiaRx varchar(200);
 ALTER TABLE ehr_lookups.procedures ADD antibioticRx varchar(200);
 
-/* EHR_Lookups-12.391-12.392.sql */
-
 ALTER TABLE ehr_lookups.treatment_frequency ADD shortname varchar(200);
 ALTER TABLE ehr_lookups.treatment_frequency ADD legacyname varchar(200);
 
-/* EHR_Lookups-12.392-12.393.sql */
-
 ALTER TABLE ehr_lookups.treatment_frequency ADD active bool default true;
 ALTER TABLE ehr_lookups.treatment_frequency DROP COLUMN legacyname;
 
-/* EHR_Lookups-12.396-12.397.sql */
-
 ALTER TABLE ehr_lookups.procedures add timeOfMeds varchar(200);
 
-/* EHR_Lookups-12.398-12.399.sql */
-
 ALTER TABLE ehr_lookups.lookups add category varchar(200);
 
-/* EHR_Lookups-12.399-12.400.sql */
-
 ALTER TABLE ehr_lookups.cage ADD status VARCHAR(200);
 
-/* EHR_Lookups-12.401-12.402.sql */
-
 CREATE TABLE ehr_lookups.flag_values (
     rowid serial,
     category varchar(100),
@@ -9632,8 +9421,6 @@ CREATE TABLE ehr_lookups.flag_values (
 
 ALTER TABLE ehr_lookups.procedures DROP COLUMN timeofmeds;
 
-/* EHR_Lookups-12.405-12.406.sql */
-
 DROP TABLE ehr_lookups.flag_values;
 
 CREATE TABLE ehr_lookups.flag_values (
@@ -9654,12 +9441,8 @@ CREATE TABLE ehr_lookups.flag_values (
     CONSTRAINT PK_flag_values PRIMARY KEY (rowid)
 );
 
-/* EHR_Lookups-12.406-12.407.sql */
-
 UPDATE ehr_lookups.lookup_sets SET keyField = 'value' WHERE setname = 'birth_condition';
 
-/* EHR_Lookups-12.407-12.408.sql */
-
 delete from ehr_lookups.cage_positions where row = 'N';
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('N1', 'N', 1, 137);
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('N2', 'N', 2, 138);
@@ -9676,8 +9459,6 @@ insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('S3', 'S', 1, 148);
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('S4', 'S', 1, 149);
 
-/* EHR_Lookups-12.408-12.409.sql */
-
 alter table ehr_lookups.divider_types add datedisabled timestamp;
 alter table ehr_lookups.divider_types add isMoveable boolean default true;
 
@@ -9692,12 +9473,8 @@ update ehr_lookups.cage_type  set abbreviation = 'T' WHERE cagetype like '%T';
 insert into ehr_lookups.divider_types (divider, countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, isMoveable)
 select 'Cage Well (Solid)', countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, false from ehr_lookups.divider_types where divider = 'Solid Divider';
 
-/* EHR_Lookups-12.409-12.410.sql */
-
 CREATE INDEX IDX_snomed_container_code_rowid ON ehr_lookups.snomed (container, code, rowid);
 
-/* EHR_Lookups-12.410-12.411.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD datedisabled timestamp;
 
 UPDATE ehr_lookups.divider_types SET divider = 'Cage Wall (Solid)' WHERE divider = 'Cage Well (Solid)';
@@ -9705,8 +9482,6 @@ UPDATE ehr_lookups.divider_types SET divider = 'Cage Wall (Solid)' WHERE divider
 insert into ehr_lookups.divider_types (divider, countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, isMoveable)
 select 'Feeder Slide', countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, true from ehr_lookups.divider_types where divider = 'Solid Divider';
 
-/* EHR_Lookups-12.411-12.412.sql */
-
 DROP TABLE ehr_lookups.flag_values;
 
 CREATE TABLE ehr_lookups.flag_values (
@@ -9728,35 +9503,21 @@ CREATE TABLE ehr_lookups.flag_values (
     CONSTRAINT PK_flag_values PRIMARY KEY (objectid)
 );
 
-/* EHR_Lookups-12.412-12.413.sql */
-
 DROP TABLE ehr_lookups.animal_condition;
 
-/* EHR_Lookups-12.413-12.414.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD method varchar(100);
 
-/* EHR_Lookups-12.414-12.415.sql */
-
 UPDATE ehr_lookups.lookups SET set_name = 'housingDefinition' WHERE set_name = 'LocationDefinition';
 UPDATE ehr_lookups.lookups SET set_name = 'housingTypes' WHERE set_name = 'LocationType';
 
-/* EHR_Lookups-12.417-12.418.sql */
-
 DROP INDEX ehr_lookups.rooms_sort_order_room;
 
 CREATE INDEX ehr_lookups_set_name_value ON ehr_lookups.lookups (set_name, value);
 
-/* EHR_Lookups-12.420-12.421.sql */
-
 CREATE INDEX IDX_rooms_area_room ON ehr_lookups.rooms (area, room);
 
-/* EHR_Lookups-12.422-12.423.sql */
-
 ALTER TABLE ehr_lookups.snomed_subsets ADD description VARCHAR(4000);
 
-/* EHR_Lookups-12.423-12.424.sql */
-
 ALTER TABLE ehr_lookups.lookup_sets ADD rowid serial;
 ALTER TABLE ehr_lookups.lookup_sets ADD container entityid;
 ALTER TABLE ehr_lookups.lookups ADD container entityid;
@@ -9775,8 +9536,6 @@ UPDATE ehr_lookups.lookups SET container = (SELECT c.entityid from core.containe
 DELETE FROM ehr_lookups.lookup_sets WHERE container IS NULL;
 DELETE FROM ehr_lookups.lookups WHERE container IS NULL;
 
-/* EHR_Lookups-12.424-12.425.sql */
-
 CREATE FUNCTION ehr.handleUpgrade() RETURNS VOID AS $$
 DECLARE
     BEGIN
@@ -9901,4 +9660,435 @@ ALTER TABLE ehr_lookups.treatment_codes ALTER COLUMN Container SET NOT NULL;
 CREATE INDEX IX_geographic_origins_Container ON ehr_lookups.geographic_origins (Container);
 CREATE INDEX IX_rooms_Container ON ehr_lookups.rooms (Container);
 CREATE INDEX IX_buildings_Container ON ehr_lookups.buildings (Container);
-CREATE INDEX IX_treatment_codes_Container ON ehr_lookups.treatment_codes (Container);
\ No newline at end of file
+CREATE INDEX IX_treatment_codes_Container ON ehr_lookups.treatment_codes (Container);
+
+/* ehr_lookups-18.10-18.20.sql */
+
+-- add Container column to the ehr/ehr_lookups tables (values to be populated in Java upgrade script)
+ALTER TABLE ehr.protocolProcedures ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr.scheduled_task_types ADD COLUMN Container ENTITYID;
+
+ALTER TABLE ehr.protocolProcedures ADD CONSTRAINT FK_ehr_protocolProcedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr.scheduled_task_types ADD CONSTRAINT FK_ehr_scheduled_task_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+
+ALTER TABLE ehr_lookups.ageclass ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.amount_units ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.areas ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.billingtypes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_draw_services ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.cage ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.cage_positions ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.cage_type ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.cageclass ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.calculated_status_codes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.clinpath_status ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.clinpath_tests ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.conc_units ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.death_remarks ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.disallowed_medications ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.divider_types ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.dosage_units ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.drug_defaults ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.flag_categories ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.full_snomed ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.gender_codes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.lab_test_range ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.lab_tests ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_panels ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_services ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_types ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.note_types ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.parentageTypes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_charges ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_codes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_comments ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_flags ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_treatments ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.procedures ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.project_types ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.relationshipTypes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.request_priority ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.restraint_type ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.routes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.snomap ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.source ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.species ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.species_codes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.treatment_frequency ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.treatment_frequency_times ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.usda_codes ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.usda_levels ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.volume_units ADD COLUMN Container ENTITYID;
+ALTER TABLE ehr_lookups.weight_ranges ADD COLUMN Container ENTITYID;
+
+-- add the FK for those Container columns
+ALTER TABLE ehr_lookups.ageclass ADD CONSTRAINT FK_ehr_lookups_ageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT FK_ehr_lookups_amount_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.areas ADD CONSTRAINT FK_ehr_lookups_areas_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.billingtypes ADD CONSTRAINT FK_ehr_lookups_billingtypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT FK_ehr_lookups_blood_draw_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT FK_ehr_lookups_blood_draw_tube_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT FK_ehr_lookups_blood_tube_volumes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage ADD CONSTRAINT FK_ehr_lookups_cage_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT FK_ehr_lookups_cage_positions_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT FK_ehr_lookups_cage_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cageclass ADD CONSTRAINT FK_ehr_lookups_cageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT FK_ehr_lookups_calculated_status_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.clinpath_status ADD CONSTRAINT FK_ehr_lookups_clinpath_status_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT FK_ehr_lookups_clinpath_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT FK_ehr_lookups_conc_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT FK_ehr_lookups_death_remarks_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.disallowed_medications ADD CONSTRAINT FK_ehr_lookups_disallowed_medications_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.divider_types ADD CONSTRAINT FK_ehr_lookups_divider_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT FK_ehr_lookups_dosage_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT FK_ehr_lookups_drug_defaults_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT FK_ehr_lookups_flag_categories_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.full_snomed ADD CONSTRAINT FK_ehr_lookups_full_snomed_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT FK_ehr_lookups_gender_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.lab_test_range ADD CONSTRAINT FK_ehr_lookups_lab_test_range_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.lab_tests ADD CONSTRAINT FK_ehr_lookups_lab_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_panels ADD CONSTRAINT FK_ehr_lookups_labwork_panels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT FK_ehr_lookups_labwork_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT FK_ehr_lookups_labwork_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.note_types ADD CONSTRAINT FK_ehr_lookups_note_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT FK_ehr_lookups_parentageTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_charges ADD CONSTRAINT FK_ehr_lookups_procedure_default_charges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_codes ADD CONSTRAINT FK_ehr_lookups_procedure_default_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_comments ADD CONSTRAINT FK_ehr_lookups_procedure_default_comments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_flags ADD CONSTRAINT FK_ehr_lookups_procedure_default_flags_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_treatments ADD CONSTRAINT FK_ehr_lookups_procedure_default_treatments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedures ADD CONSTRAINT FK_ehr_lookups_procedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.project_types ADD CONSTRAINT FK_ehr_lookups_project_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.relationshipTypes ADD CONSTRAINT FK_ehr_lookups_relationshipTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT FK_ehr_lookups_request_priority_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT FK_ehr_lookups_restraint_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.routes ADD CONSTRAINT FK_ehr_lookups_routes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.snomap ADD CONSTRAINT FK_ehr_lookups_snomap_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.source ADD CONSTRAINT FK_ehr_lookups_source_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.species ADD CONSTRAINT FK_ehr_lookups_species_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT FK_ehr_lookups_species_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.treatment_frequency ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.treatment_frequency_times ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_times_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.usda_codes ADD CONSTRAINT FK_ehr_lookups_usda_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT FK_ehr_lookups_usda_levels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT FK_ehr_lookups_volume_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT FK_ehr_lookups_weight_ranges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+
+-- remove any NULL rows for Container
+DELETE FROM ehr.protocolProcedures WHERE Container IS NULL;
+DELETE FROM ehr.scheduled_task_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.ageclass WHERE Container IS NULL;
+DELETE FROM ehr_lookups.amount_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.areas WHERE Container IS NULL;
+DELETE FROM ehr_lookups.billingtypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_draw_services WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_draw_tube_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_tube_volumes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage_positions WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cageclass WHERE Container IS NULL;
+DELETE FROM ehr_lookups.calculated_status_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.clinpath_status WHERE Container IS NULL;
+DELETE FROM ehr_lookups.clinpath_tests WHERE Container IS NULL;
+DELETE FROM ehr_lookups.conc_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.death_remarks WHERE Container IS NULL;
+DELETE FROM ehr_lookups.disallowed_medications WHERE Container IS NULL;
+DELETE FROM ehr_lookups.divider_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.dosage_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.drug_defaults WHERE Container IS NULL;
+DELETE FROM ehr_lookups.flag_categories WHERE Container IS NULL;
+DELETE FROM ehr_lookups.full_snomed WHERE Container IS NULL;
+DELETE FROM ehr_lookups.gender_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.lab_test_range WHERE Container IS NULL;
+DELETE FROM ehr_lookups.lab_tests WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_panels WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_services WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.note_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.parentageTypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_charges WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_comments WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_flags WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_treatments WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedures WHERE Container IS NULL;
+DELETE FROM ehr_lookups.project_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.relationshipTypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.request_priority WHERE Container IS NULL;
+DELETE FROM ehr_lookups.restraint_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.routes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.snomap WHERE Container IS NULL;
+DELETE FROM ehr_lookups.source WHERE Container IS NULL;
+DELETE FROM ehr_lookups.species WHERE Container IS NULL;
+DELETE FROM ehr_lookups.species_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.treatment_frequency WHERE Container IS NULL;
+DELETE FROM ehr_lookups.treatment_frequency_times WHERE Container IS NULL;
+DELETE FROM ehr_lookups.usda_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.usda_levels WHERE Container IS NULL;
+DELETE FROM ehr_lookups.volume_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.weight_ranges WHERE Container IS NULL;
+
+--set NOT NULL constraint for the Container columns
+ALTER TABLE ehr.protocolProcedures ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr.scheduled_task_types ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.ageclass ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.amount_units ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.areas ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.billingtypes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.blood_draw_services ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.blood_draw_tube_type ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.blood_tube_volumes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.cage ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.cage_positions ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.cage_type ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.cageclass ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.calculated_status_codes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.clinpath_status ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.clinpath_tests ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.conc_units ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.death_remarks ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.disallowed_medications ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.divider_types ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.dosage_units ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.drug_defaults ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.flag_categories ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.full_snomed ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.gender_codes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.lab_test_range ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.lab_tests ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.labwork_panels ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.labwork_services ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.labwork_types ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.note_types ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.parentageTypes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_charges ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_codes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_comments ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_flags ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_treatments ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.procedures ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.project_types ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.relationshipTypes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.request_priority ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.restraint_type ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.routes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.snomap ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.source ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.species ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.species_codes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.treatment_frequency ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.treatment_frequency_times ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.usda_codes ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.usda_levels ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.volume_units ALTER COLUMN Container SET NOT NULL;
+ALTER TABLE ehr_lookups.weight_ranges ALTER COLUMN Container SET NOT NULL;
+
+-- add the INDEX for those Container columns
+CREATE INDEX IX_ehr_protocolProcedures_Container ON ehr.protocolProcedures (Container);
+CREATE INDEX IX_ehr_scheduled_task_types_Container ON ehr.scheduled_task_types (Container);
+CREATE INDEX IX_ehr_lookups_ageclass_Container ON ehr_lookups.ageclass (Container);
+CREATE INDEX IX_ehr_lookups_amount_units_Container ON ehr_lookups.amount_units (Container);
+CREATE INDEX IX_ehr_lookups_areas_Container ON ehr_lookups.areas (Container);
+CREATE INDEX IX_ehr_lookups_billingtypes_Container ON ehr_lookups.billingtypes (Container);
+CREATE INDEX IX_ehr_lookups_blood_draw_services_Container ON ehr_lookups.blood_draw_services (Container);
+CREATE INDEX IX_ehr_lookups_blood_draw_tube_type_Container ON ehr_lookups.blood_draw_tube_type (Container);
+CREATE INDEX IX_ehr_lookups_blood_tube_volumes_Container ON ehr_lookups.blood_tube_volumes (Container);
+CREATE INDEX IX_ehr_lookups_cage_Container ON ehr_lookups.cage (Container);
+CREATE INDEX IX_ehr_lookups_cage_positions_Container ON ehr_lookups.cage_positions (Container);
+CREATE INDEX IX_ehr_lookups_cage_type_Container ON ehr_lookups.cage_type (Container);
+CREATE INDEX IX_ehr_lookups_cageclass_Container ON ehr_lookups.cageclass (Container);
+CREATE INDEX IX_ehr_lookups_calculated_status_codes_Container ON ehr_lookups.calculated_status_codes (Container);
+CREATE INDEX IX_ehr_lookups_clinpath_status_Container ON ehr_lookups.clinpath_status (Container);
+CREATE INDEX IX_ehr_lookups_clinpath_tests_Container ON ehr_lookups.clinpath_tests (Container);
+CREATE INDEX IX_ehr_lookups_conc_units_Container ON ehr_lookups.conc_units (Container);
+CREATE INDEX IX_ehr_lookups_death_remarks_Container ON ehr_lookups.death_remarks (Container);
+CREATE INDEX IX_ehr_lookups_disallowed_medications_Container ON ehr_lookups.disallowed_medications (Container);
+CREATE INDEX IX_ehr_lookups_divider_types_Container ON ehr_lookups.divider_types (Container);
+CREATE INDEX IX_ehr_lookups_dosage_units_Container ON ehr_lookups.dosage_units (Container);
+CREATE INDEX IX_ehr_lookups_drug_defaults_Container ON ehr_lookups.drug_defaults (Container);
+CREATE INDEX IX_ehr_lookups_flag_categories_Container ON ehr_lookups.flag_categories (Container);
+CREATE INDEX IX_ehr_lookups_full_snomed_Container ON ehr_lookups.full_snomed (Container);
+CREATE INDEX IX_ehr_lookups_gender_codes_Container ON ehr_lookups.gender_codes (Container);
+CREATE INDEX IX_ehr_lookups_lab_test_range_Container ON ehr_lookups.lab_test_range (Container);
+CREATE INDEX IX_ehr_lookups_lab_tests_Container ON ehr_lookups.lab_tests (Container);
+CREATE INDEX IX_ehr_lookups_labwork_panels_Container ON ehr_lookups.labwork_panels (Container);
+CREATE INDEX IX_ehr_lookups_labwork_services_Container ON ehr_lookups.labwork_services (Container);
+CREATE INDEX IX_ehr_lookups_labwork_types_Container ON ehr_lookups.labwork_types (Container);
+CREATE INDEX IX_ehr_lookups_note_types_Container ON ehr_lookups.note_types (Container);
+CREATE INDEX IX_ehr_lookups_parentageTypes_Container ON ehr_lookups.parentageTypes (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_charges_Container ON ehr_lookups.procedure_default_charges (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_codes_Container ON ehr_lookups.procedure_default_codes (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_comments_Container ON ehr_lookups.procedure_default_comments (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_flags_Container ON ehr_lookups.procedure_default_flags (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_treatments_Container ON ehr_lookups.procedure_default_treatments (Container);
+CREATE INDEX IX_ehr_lookups_procedures_Container ON ehr_lookups.procedures (Container);
+CREATE INDEX IX_ehr_lookups_project_types_Container ON ehr_lookups.project_types (Container);
+CREATE INDEX IX_ehr_lookups_relationshipTypes_Container ON ehr_lookups.relationshipTypes (Container);
+CREATE INDEX IX_ehr_lookups_request_priority_Container ON ehr_lookups.request_priority (Container);
+CREATE INDEX IX_ehr_lookups_restraint_type_Container ON ehr_lookups.restraint_type (Container);
+CREATE INDEX IX_ehr_lookups_routes_Container ON ehr_lookups.routes (Container);
+CREATE INDEX IX_ehr_lookups_snomap_Container ON ehr_lookups.snomap (Container);
+CREATE INDEX IX_ehr_lookups_source_Container ON ehr_lookups.source (Container);
+CREATE INDEX IX_ehr_lookups_species_Container ON ehr_lookups.species (Container);
+CREATE INDEX IX_ehr_lookups_species_codes_Container ON ehr_lookups.species_codes (Container);
+CREATE INDEX IX_ehr_lookups_treatment_frequency_Container ON ehr_lookups.treatment_frequency (Container);
+CREATE INDEX IX_ehr_lookups_treatment_frequency_times_Container ON ehr_lookups.treatment_frequency_times (Container);
+CREATE INDEX IX_ehr_lookups_usda_codes_Container ON ehr_lookups.usda_codes (Container);
+CREATE INDEX IX_ehr_lookups_usda_levels_Container ON ehr_lookups.usda_levels (Container);
+CREATE INDEX IX_ehr_lookups_volume_units_Container ON ehr_lookups.volume_units (Container);
+CREATE INDEX IX_ehr_lookups_weight_ranges_Container ON ehr_lookups.weight_ranges (Container);
+
+-- add new RowId PK column and per-container unique constraints
+ALTER TABLE ehr_lookups.calculated_status_codes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_calculated_status_codes,
+  ADD CONSTRAINT PK_calculated_status_codes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_calculated_status_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.gender_codes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_gender_codes,
+  ADD CONSTRAINT PK_gender_codes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_gender_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.routes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_routes,
+  ADD CONSTRAINT PK_routes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_routes UNIQUE (Container,Route);
+ALTER TABLE ehr_lookups.blood_draw_tube_type
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_blood_draw_tube_type,
+  ADD CONSTRAINT PK_blood_draw_tube_type PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_blood_draw_tube_type UNIQUE (Container,Type);
+ALTER TABLE ehr_lookups.blood_tube_volumes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_blood_tube_volumes,
+  ADD CONSTRAINT PK_blood_tube_volumes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_blood_tube_volumes UNIQUE (Container,Volume);
+ALTER TABLE ehr_lookups.blood_draw_services
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_blood_draw_services,
+  ADD CONSTRAINT PK_blood_draw_services PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_blood_draw_services UNIQUE (Container,Service);
+ALTER TABLE ehr_lookups.dosage_units
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_dosage_units,
+  ADD CONSTRAINT PK_dosage_units PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_dosage_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.conc_units
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_conc_units,
+  ADD CONSTRAINT PK_conc_units PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_conc_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.volume_units
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_volume_units,
+  ADD CONSTRAINT PK_volume_units PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_volume_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.amount_units
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_amount_units,
+  ADD CONSTRAINT PK_amount_units PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_amount_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.flag_categories
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_flag_categories,
+  ADD CONSTRAINT PK_flag_categories PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_flag_categories UNIQUE (Container,Category);
+ALTER TABLE ehr_lookups.weight_ranges
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_weight_ranges,
+  ADD CONSTRAINT PK_weight_ranges PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_weight_ranges UNIQUE (Container,Species);
+ALTER TABLE ehr_lookups.species
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_species,
+  ADD CONSTRAINT PK_species PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_species UNIQUE (Container,Common);
+ALTER TABLE ehr_lookups.species_codes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_species_codes,
+  ADD CONSTRAINT PK_species_codes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_species_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.parentageTypes
+  ADD COLUMN RowId SERIAL,
+  ADD CONSTRAINT PK_parentageTypes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_parentageTypes UNIQUE (Container,Label);
+ALTER TABLE ehr_lookups.labwork_services
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_labwork_services,
+  ADD CONSTRAINT PK_labwork_services PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_labwork_services UNIQUE (Container,ServiceName);
+ALTER TABLE ehr_lookups.source
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_source,
+  ADD CONSTRAINT PK_source PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_source UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.usda_levels
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_usda_levels,
+  ADD CONSTRAINT PK_usda_levels PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_usda_levels UNIQUE (Container,usda_level);
+ALTER TABLE ehr_lookups.areas
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_areas,
+  ADD CONSTRAINT PK_areas PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_areas UNIQUE (Container,Area);
+ALTER TABLE ehr_lookups.cage_positions
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_cage_positions,
+  ADD CONSTRAINT PK_cage_positions PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_cage_positions UNIQUE (Container,Cage);
+ALTER TABLE ehr_lookups.clinpath_tests
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_testname,
+  ADD CONSTRAINT PK_clinpath_tests PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_clinpath_tests UNIQUE (Container,TestName);
+ALTER TABLE ehr_lookups.death_remarks
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_death_remarks,
+  ADD CONSTRAINT PK_death_remarks PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_death_remarks UNIQUE (Container,Title);
+ALTER TABLE ehr_lookups.request_priority
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_request_priority,
+  ADD CONSTRAINT PK_request_priority PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_request_priority UNIQUE (Container,Priority);
+ALTER TABLE ehr_lookups.restraint_type
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_restraint_type,
+  ADD CONSTRAINT PK_restraint_type PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_restraint_type UNIQUE (Container,Type);
+ALTER TABLE ehr_lookups.labwork_types
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_labwork_types,
+  ADD CONSTRAINT PK_labwork_types PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_labwork_types UNIQUE (Container,Type);
+
+-- add new RowId PK column and per-container unique constraints
+ALTER TABLE ehr_lookups.treatment_codes
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_treatment_codes,
+  ADD CONSTRAINT PK_treatment_codes PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_treatment_codes UNIQUE (Container,Meaning);
+ALTER TABLE ehr_lookups.buildings
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_buildings,
+  ADD CONSTRAINT PK_buildings PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_buildings UNIQUE (Container,Name);
+ALTER TABLE ehr_lookups.rooms
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_rooms CASCADE,
+  ADD CONSTRAINT PK_rooms PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_rooms UNIQUE (Container,Room);
+ALTER TABLE ehr_lookups.cage
+  DROP CONSTRAINT PK_cage,
+  ADD CONSTRAINT PK_cage PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_cage UNIQUE (Container,Location);
+ALTER TABLE ehr_lookups.cage_type
+  ADD COLUMN RowId SERIAL,
+  DROP CONSTRAINT PK_cage_type,
+  ADD CONSTRAINT PK_cage_type PRIMARY KEY (RowId),
+  ADD CONSTRAINT UQ_cage_type UNIQUE (Container,CageType);
\ No newline at end of file
diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-18.10-18.20.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-18.10-18.20.sql
deleted file mode 100644
index e0176a7f2..000000000
--- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-18.10-18.20.sql
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- * Copyright (c) 2018-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
- */
-/* ehr_lookups-18.10-18.11.sql */
-
--- add Container column to the ehr/ehr_lookups tables (values to be populated in Java upgrade script)
-ALTER TABLE ehr.protocolProcedures ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr.scheduled_task_types ADD COLUMN Container ENTITYID;
-
-ALTER TABLE ehr.protocolProcedures ADD CONSTRAINT FK_ehr_protocolProcedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr.scheduled_task_types ADD CONSTRAINT FK_ehr_scheduled_task_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-
--- Java upgrade script to populate the Container column from site-level EHRStudyContainer module property
-SELECT core.executeJavaUpgradeCode('setEhrContainerFirstSet');
-
-ALTER TABLE ehr_lookups.ageclass ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.amount_units ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.areas ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.billingtypes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_draw_services ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.cage ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.cage_positions ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.cage_type ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.cageclass ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.calculated_status_codes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.clinpath_status ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.clinpath_tests ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.conc_units ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.death_remarks ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.disallowed_medications ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.divider_types ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.dosage_units ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.drug_defaults ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.flag_categories ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.full_snomed ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.gender_codes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.lab_test_range ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.lab_tests ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_panels ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_services ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_types ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.note_types ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.parentageTypes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_charges ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_codes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_comments ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_flags ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_treatments ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.procedures ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.project_types ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.relationshipTypes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.request_priority ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.restraint_type ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.routes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.snomap ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.source ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.species ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.species_codes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.treatment_frequency ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.treatment_frequency_times ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.usda_codes ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.usda_levels ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.volume_units ADD COLUMN Container ENTITYID;
-ALTER TABLE ehr_lookups.weight_ranges ADD COLUMN Container ENTITYID;
-
--- add the FK for those Container columns
-ALTER TABLE ehr_lookups.ageclass ADD CONSTRAINT FK_ehr_lookups_ageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT FK_ehr_lookups_amount_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.areas ADD CONSTRAINT FK_ehr_lookups_areas_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.billingtypes ADD CONSTRAINT FK_ehr_lookups_billingtypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT FK_ehr_lookups_blood_draw_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT FK_ehr_lookups_blood_draw_tube_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT FK_ehr_lookups_blood_tube_volumes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage ADD CONSTRAINT FK_ehr_lookups_cage_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT FK_ehr_lookups_cage_positions_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT FK_ehr_lookups_cage_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cageclass ADD CONSTRAINT FK_ehr_lookups_cageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT FK_ehr_lookups_calculated_status_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.clinpath_status ADD CONSTRAINT FK_ehr_lookups_clinpath_status_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT FK_ehr_lookups_clinpath_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT FK_ehr_lookups_conc_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT FK_ehr_lookups_death_remarks_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.disallowed_medications ADD CONSTRAINT FK_ehr_lookups_disallowed_medications_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.divider_types ADD CONSTRAINT FK_ehr_lookups_divider_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT FK_ehr_lookups_dosage_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT FK_ehr_lookups_drug_defaults_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT FK_ehr_lookups_flag_categories_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.full_snomed ADD CONSTRAINT FK_ehr_lookups_full_snomed_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT FK_ehr_lookups_gender_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.lab_test_range ADD CONSTRAINT FK_ehr_lookups_lab_test_range_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.lab_tests ADD CONSTRAINT FK_ehr_lookups_lab_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_panels ADD CONSTRAINT FK_ehr_lookups_labwork_panels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT FK_ehr_lookups_labwork_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT FK_ehr_lookups_labwork_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.note_types ADD CONSTRAINT FK_ehr_lookups_note_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT FK_ehr_lookups_parentageTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_charges ADD CONSTRAINT FK_ehr_lookups_procedure_default_charges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_codes ADD CONSTRAINT FK_ehr_lookups_procedure_default_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_comments ADD CONSTRAINT FK_ehr_lookups_procedure_default_comments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_flags ADD CONSTRAINT FK_ehr_lookups_procedure_default_flags_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_treatments ADD CONSTRAINT FK_ehr_lookups_procedure_default_treatments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedures ADD CONSTRAINT FK_ehr_lookups_procedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.project_types ADD CONSTRAINT FK_ehr_lookups_project_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.relationshipTypes ADD CONSTRAINT FK_ehr_lookups_relationshipTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT FK_ehr_lookups_request_priority_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT FK_ehr_lookups_restraint_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.routes ADD CONSTRAINT FK_ehr_lookups_routes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.snomap ADD CONSTRAINT FK_ehr_lookups_snomap_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.source ADD CONSTRAINT FK_ehr_lookups_source_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.species ADD CONSTRAINT FK_ehr_lookups_species_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT FK_ehr_lookups_species_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.treatment_frequency ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.treatment_frequency_times ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_times_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.usda_codes ADD CONSTRAINT FK_ehr_lookups_usda_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT FK_ehr_lookups_usda_levels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT FK_ehr_lookups_volume_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT FK_ehr_lookups_weight_ranges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-
--- Java upgrade script to populate the Container column from site-level EHRStudyContainer module property
-SELECT core.executeJavaUpgradeCode('setEhrLookupsContainerSecondSet');
-
--- remove any NULL rows for Container
-DELETE FROM ehr.protocolProcedures WHERE Container IS NULL;
-DELETE FROM ehr.scheduled_task_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.ageclass WHERE Container IS NULL;
-DELETE FROM ehr_lookups.amount_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.areas WHERE Container IS NULL;
-DELETE FROM ehr_lookups.billingtypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_draw_services WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_draw_tube_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_tube_volumes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage_positions WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cageclass WHERE Container IS NULL;
-DELETE FROM ehr_lookups.calculated_status_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.clinpath_status WHERE Container IS NULL;
-DELETE FROM ehr_lookups.clinpath_tests WHERE Container IS NULL;
-DELETE FROM ehr_lookups.conc_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.death_remarks WHERE Container IS NULL;
-DELETE FROM ehr_lookups.disallowed_medications WHERE Container IS NULL;
-DELETE FROM ehr_lookups.divider_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.dosage_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.drug_defaults WHERE Container IS NULL;
-DELETE FROM ehr_lookups.flag_categories WHERE Container IS NULL;
-DELETE FROM ehr_lookups.full_snomed WHERE Container IS NULL;
-DELETE FROM ehr_lookups.gender_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.lab_test_range WHERE Container IS NULL;
-DELETE FROM ehr_lookups.lab_tests WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_panels WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_services WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.note_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.parentageTypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_charges WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_comments WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_flags WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_treatments WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedures WHERE Container IS NULL;
-DELETE FROM ehr_lookups.project_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.relationshipTypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.request_priority WHERE Container IS NULL;
-DELETE FROM ehr_lookups.restraint_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.routes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.snomap WHERE Container IS NULL;
-DELETE FROM ehr_lookups.source WHERE Container IS NULL;
-DELETE FROM ehr_lookups.species WHERE Container IS NULL;
-DELETE FROM ehr_lookups.species_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.treatment_frequency WHERE Container IS NULL;
-DELETE FROM ehr_lookups.treatment_frequency_times WHERE Container IS NULL;
-DELETE FROM ehr_lookups.usda_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.usda_levels WHERE Container IS NULL;
-DELETE FROM ehr_lookups.volume_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.weight_ranges WHERE Container IS NULL;
-
---set NOT NULL constraint for the Container columns
-ALTER TABLE ehr.protocolProcedures ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr.scheduled_task_types ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.ageclass ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.amount_units ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.areas ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.billingtypes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.blood_draw_services ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.blood_draw_tube_type ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.blood_tube_volumes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.cage ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.cage_positions ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.cage_type ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.cageclass ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.calculated_status_codes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.clinpath_status ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.clinpath_tests ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.conc_units ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.death_remarks ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.disallowed_medications ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.divider_types ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.dosage_units ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.drug_defaults ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.flag_categories ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.full_snomed ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.gender_codes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.lab_test_range ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.lab_tests ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.labwork_panels ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.labwork_services ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.labwork_types ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.note_types ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.parentageTypes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_charges ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_codes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_comments ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_flags ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_treatments ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.procedures ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.project_types ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.relationshipTypes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.request_priority ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.restraint_type ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.routes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.snomap ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.source ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.species ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.species_codes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.treatment_frequency ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.treatment_frequency_times ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.usda_codes ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.usda_levels ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.volume_units ALTER COLUMN Container SET NOT NULL;
-ALTER TABLE ehr_lookups.weight_ranges ALTER COLUMN Container SET NOT NULL;
-
--- add the INDEX for those Container columns
-CREATE INDEX IX_ehr_protocolProcedures_Container ON ehr.protocolProcedures (Container);
-CREATE INDEX IX_ehr_scheduled_task_types_Container ON ehr.scheduled_task_types (Container);
-CREATE INDEX IX_ehr_lookups_ageclass_Container ON ehr_lookups.ageclass (Container);
-CREATE INDEX IX_ehr_lookups_amount_units_Container ON ehr_lookups.amount_units (Container);
-CREATE INDEX IX_ehr_lookups_areas_Container ON ehr_lookups.areas (Container);
-CREATE INDEX IX_ehr_lookups_billingtypes_Container ON ehr_lookups.billingtypes (Container);
-CREATE INDEX IX_ehr_lookups_blood_draw_services_Container ON ehr_lookups.blood_draw_services (Container);
-CREATE INDEX IX_ehr_lookups_blood_draw_tube_type_Container ON ehr_lookups.blood_draw_tube_type (Container);
-CREATE INDEX IX_ehr_lookups_blood_tube_volumes_Container ON ehr_lookups.blood_tube_volumes (Container);
-CREATE INDEX IX_ehr_lookups_cage_Container ON ehr_lookups.cage (Container);
-CREATE INDEX IX_ehr_lookups_cage_positions_Container ON ehr_lookups.cage_positions (Container);
-CREATE INDEX IX_ehr_lookups_cage_type_Container ON ehr_lookups.cage_type (Container);
-CREATE INDEX IX_ehr_lookups_cageclass_Container ON ehr_lookups.cageclass (Container);
-CREATE INDEX IX_ehr_lookups_calculated_status_codes_Container ON ehr_lookups.calculated_status_codes (Container);
-CREATE INDEX IX_ehr_lookups_clinpath_status_Container ON ehr_lookups.clinpath_status (Container);
-CREATE INDEX IX_ehr_lookups_clinpath_tests_Container ON ehr_lookups.clinpath_tests (Container);
-CREATE INDEX IX_ehr_lookups_conc_units_Container ON ehr_lookups.conc_units (Container);
-CREATE INDEX IX_ehr_lookups_death_remarks_Container ON ehr_lookups.death_remarks (Container);
-CREATE INDEX IX_ehr_lookups_disallowed_medications_Container ON ehr_lookups.disallowed_medications (Container);
-CREATE INDEX IX_ehr_lookups_divider_types_Container ON ehr_lookups.divider_types (Container);
-CREATE INDEX IX_ehr_lookups_dosage_units_Container ON ehr_lookups.dosage_units (Container);
-CREATE INDEX IX_ehr_lookups_drug_defaults_Container ON ehr_lookups.drug_defaults (Container);
-CREATE INDEX IX_ehr_lookups_flag_categories_Container ON ehr_lookups.flag_categories (Container);
-CREATE INDEX IX_ehr_lookups_full_snomed_Container ON ehr_lookups.full_snomed (Container);
-CREATE INDEX IX_ehr_lookups_gender_codes_Container ON ehr_lookups.gender_codes (Container);
-CREATE INDEX IX_ehr_lookups_lab_test_range_Container ON ehr_lookups.lab_test_range (Container);
-CREATE INDEX IX_ehr_lookups_lab_tests_Container ON ehr_lookups.lab_tests (Container);
-CREATE INDEX IX_ehr_lookups_labwork_panels_Container ON ehr_lookups.labwork_panels (Container);
-CREATE INDEX IX_ehr_lookups_labwork_services_Container ON ehr_lookups.labwork_services (Container);
-CREATE INDEX IX_ehr_lookups_labwork_types_Container ON ehr_lookups.labwork_types (Container);
-CREATE INDEX IX_ehr_lookups_note_types_Container ON ehr_lookups.note_types (Container);
-CREATE INDEX IX_ehr_lookups_parentageTypes_Container ON ehr_lookups.parentageTypes (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_charges_Container ON ehr_lookups.procedure_default_charges (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_codes_Container ON ehr_lookups.procedure_default_codes (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_comments_Container ON ehr_lookups.procedure_default_comments (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_flags_Container ON ehr_lookups.procedure_default_flags (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_treatments_Container ON ehr_lookups.procedure_default_treatments (Container);
-CREATE INDEX IX_ehr_lookups_procedures_Container ON ehr_lookups.procedures (Container);
-CREATE INDEX IX_ehr_lookups_project_types_Container ON ehr_lookups.project_types (Container);
-CREATE INDEX IX_ehr_lookups_relationshipTypes_Container ON ehr_lookups.relationshipTypes (Container);
-CREATE INDEX IX_ehr_lookups_request_priority_Container ON ehr_lookups.request_priority (Container);
-CREATE INDEX IX_ehr_lookups_restraint_type_Container ON ehr_lookups.restraint_type (Container);
-CREATE INDEX IX_ehr_lookups_routes_Container ON ehr_lookups.routes (Container);
-CREATE INDEX IX_ehr_lookups_snomap_Container ON ehr_lookups.snomap (Container);
-CREATE INDEX IX_ehr_lookups_source_Container ON ehr_lookups.source (Container);
-CREATE INDEX IX_ehr_lookups_species_Container ON ehr_lookups.species (Container);
-CREATE INDEX IX_ehr_lookups_species_codes_Container ON ehr_lookups.species_codes (Container);
-CREATE INDEX IX_ehr_lookups_treatment_frequency_Container ON ehr_lookups.treatment_frequency (Container);
-CREATE INDEX IX_ehr_lookups_treatment_frequency_times_Container ON ehr_lookups.treatment_frequency_times (Container);
-CREATE INDEX IX_ehr_lookups_usda_codes_Container ON ehr_lookups.usda_codes (Container);
-CREATE INDEX IX_ehr_lookups_usda_levels_Container ON ehr_lookups.usda_levels (Container);
-CREATE INDEX IX_ehr_lookups_volume_units_Container ON ehr_lookups.volume_units (Container);
-CREATE INDEX IX_ehr_lookups_weight_ranges_Container ON ehr_lookups.weight_ranges (Container);
-
--- add new RowId PK column and per-container unique constraints
-ALTER TABLE ehr_lookups.calculated_status_codes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_calculated_status_codes,
-  ADD CONSTRAINT PK_calculated_status_codes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_calculated_status_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.gender_codes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_gender_codes,
-  ADD CONSTRAINT PK_gender_codes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_gender_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.routes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_routes,
-  ADD CONSTRAINT PK_routes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_routes UNIQUE (Container,Route);
-ALTER TABLE ehr_lookups.blood_draw_tube_type
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_blood_draw_tube_type,
-  ADD CONSTRAINT PK_blood_draw_tube_type PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_blood_draw_tube_type UNIQUE (Container,Type);
-ALTER TABLE ehr_lookups.blood_tube_volumes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_blood_tube_volumes,
-  ADD CONSTRAINT PK_blood_tube_volumes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_blood_tube_volumes UNIQUE (Container,Volume);
-ALTER TABLE ehr_lookups.blood_draw_services
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_blood_draw_services,
-  ADD CONSTRAINT PK_blood_draw_services PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_blood_draw_services UNIQUE (Container,Service);
-ALTER TABLE ehr_lookups.dosage_units
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_dosage_units,
-  ADD CONSTRAINT PK_dosage_units PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_dosage_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.conc_units
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_conc_units,
-  ADD CONSTRAINT PK_conc_units PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_conc_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.volume_units
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_volume_units,
-  ADD CONSTRAINT PK_volume_units PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_volume_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.amount_units
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_amount_units,
-  ADD CONSTRAINT PK_amount_units PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_amount_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.flag_categories
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_flag_categories,
-  ADD CONSTRAINT PK_flag_categories PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_flag_categories UNIQUE (Container,Category);
-ALTER TABLE ehr_lookups.weight_ranges
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_weight_ranges,
-  ADD CONSTRAINT PK_weight_ranges PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_weight_ranges UNIQUE (Container,Species);
-ALTER TABLE ehr_lookups.species
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_species,
-  ADD CONSTRAINT PK_species PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_species UNIQUE (Container,Common);
-ALTER TABLE ehr_lookups.species_codes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_species_codes,
-  ADD CONSTRAINT PK_species_codes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_species_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.parentageTypes
-  ADD COLUMN RowId SERIAL,
-  ADD CONSTRAINT PK_parentageTypes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_parentageTypes UNIQUE (Container,Label);
-ALTER TABLE ehr_lookups.labwork_services
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_labwork_services,
-  ADD CONSTRAINT PK_labwork_services PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_labwork_services UNIQUE (Container,ServiceName);
-ALTER TABLE ehr_lookups.source
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_source,
-  ADD CONSTRAINT PK_source PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_source UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.usda_levels
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_usda_levels,
-  ADD CONSTRAINT PK_usda_levels PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_usda_levels UNIQUE (Container,usda_level);
-ALTER TABLE ehr_lookups.areas
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_areas,
-  ADD CONSTRAINT PK_areas PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_areas UNIQUE (Container,Area);
-ALTER TABLE ehr_lookups.cage_positions
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_cage_positions,
-  ADD CONSTRAINT PK_cage_positions PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_cage_positions UNIQUE (Container,Cage);
-ALTER TABLE ehr_lookups.clinpath_tests
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_testname,
-  ADD CONSTRAINT PK_clinpath_tests PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_clinpath_tests UNIQUE (Container,TestName);
-ALTER TABLE ehr_lookups.death_remarks
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_death_remarks,
-  ADD CONSTRAINT PK_death_remarks PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_death_remarks UNIQUE (Container,Title);
-ALTER TABLE ehr_lookups.request_priority
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_request_priority,
-  ADD CONSTRAINT PK_request_priority PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_request_priority UNIQUE (Container,Priority);
-ALTER TABLE ehr_lookups.restraint_type
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_restraint_type,
-  ADD CONSTRAINT PK_restraint_type PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_restraint_type UNIQUE (Container,Type);
-ALTER TABLE ehr_lookups.labwork_types
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_labwork_types,
-  ADD CONSTRAINT PK_labwork_types PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_labwork_types UNIQUE (Container,Type);
-
-/* ehr_lookups-18.11-18.12.sql */
-
--- add new RowId PK column and per-container unique constraints
-ALTER TABLE ehr_lookups.treatment_codes
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_treatment_codes,
-  ADD CONSTRAINT PK_treatment_codes PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_treatment_codes UNIQUE (Container,Meaning);
-ALTER TABLE ehr_lookups.buildings
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_buildings,
-  ADD CONSTRAINT PK_buildings PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_buildings UNIQUE (Container,Name);
-ALTER TABLE ehr_lookups.rooms
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_rooms CASCADE,
-  ADD CONSTRAINT PK_rooms PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_rooms UNIQUE (Container,Room);
-ALTER TABLE ehr_lookups.cage
-  DROP CONSTRAINT PK_cage,
-  ADD CONSTRAINT PK_cage PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_cage UNIQUE (Container,Location);
-ALTER TABLE ehr_lookups.cage_type
-  ADD COLUMN RowId SERIAL,
-  DROP CONSTRAINT PK_cage_type,
-  ADD CONSTRAINT PK_cage_type PRIMARY KEY (RowId),
-  ADD CONSTRAINT UQ_cage_type UNIQUE (Container,CageType);
\ No newline at end of file
diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.10.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.20.sql
similarity index 97%
rename from ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.10.sql
rename to ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.20.sql
index 2b83645ec..f36d64377 100644
--- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.10.sql
+++ b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.00-18.20.sql
@@ -7925,7 +7925,7 @@ CREATE TABLE ehr_lookups.procedure_default_treatments (
   CONSTRAINT PK_procedure_default_treatments PRIMARY KEY (rowid)
 );
 
-/* EHR_Lookups-12.30-12.301.sql */
+/* EHR_Lookups-12.30-16.20.sql */
 
 CREATE TABLE ehr_lookups.procedure_default_comments (
   rowid int identity(1,1),
@@ -7982,8 +7982,6 @@ INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-YYY40',
 INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-721X0', 'E-YY270');
 INSERT INTO ehr_lookups.disallowed_medications (code1, code2) VALUEs ('E-721X0', 'E-72170');
 
-/* EHR_Lookups-12.301-12.302.sql */
-
 ALTER TABLE ehr_lookups.procedure_default_charges drop Column quantity;
 ALTER TABLE ehr_lookups.procedure_default_charges ADD quantity double precision;
 
@@ -8008,8 +8006,6 @@ CREATE TABLE ehr_lookups.locations (
   CONSTRAINT pk_locations PRIMARY KEY (location)
 );
 
-/* EHR_Lookups-12.302-12.303.sql */
-
 CREATE TABLE ehr_lookups.billingTypes (
   rowid int identity(1,1),
   name varchar(100),
@@ -8025,8 +8021,6 @@ ALTER TABLE ehr_lookups.species ADD blood_vol_multiplier double precision;
 GO
 UPDATE ehr_lookups.species set blood_vol_multiplier = 0.1;
 
-/* EHR_Lookups-12.305-12.306.sql */
-
 ALTER TABLE ehr_lookups.species DROP COLUMN blood_vol_multiplier;
 ALTER TABLE ehr_lookups.species ADD blood_per_kg double precision;
 ALTER TABLE ehr_lookups.species ADD max_draw_pct double precision;
@@ -8041,8 +8035,6 @@ UPDATE ehr_lookups.species set max_draw_pct = 0.15 WHERE common = 'Marmoset';
 
 DROP TABLE ehr_lookups.account_tiers;
 
-/* EHR_Lookups-12.306-12.307.sql */
-
 CREATE TABLE ehr_lookups.animal_condition (
   code integer,
   meaning varchar(100),
@@ -8072,31 +8064,21 @@ CREATE TABLE ehr_lookups.rooms (
 
 EXEC sp_rename 'ehr_lookups.cage.roomcage', 'location', 'COLUMN';
 
-/* EHR_Lookups-12.307-12.308.sql */
-
 ALTER TABLE ehr_lookups.rooms ADD housingType int;
 ALTER TABLE ehr_lookups.rooms ADD housingCondition int;
 
 DROP TABLE ehr_lookups.locations;
 
-/* EHR_Lookups-12.308-12.309.sql */
-
 alter table ehr_lookups.cage alter column room varchar(200);
 alter table ehr_lookups.cage alter column cage varchar(200);
 
-/* EHR_Lookups-12.309-12.310.sql */
-
 insert into ehr_lookups.encounter_types (type) values ('Diagnosis');
 insert into ehr_lookups.routes (route) values ('PO');
 
-/* EHR_Lookups-12.310-12.311.sql */
-
 alter table ehr_lookups.rooms add dateDisabled datetime;
 alter table ehr_lookups.rooms drop column category;
 alter table ehr_lookups.areas add dateDisabled datetime;
 
-/* EHR_Lookups-12.311-12.312.sql */
-
 ALTER TABLE ehr_lookups.cage add divider int;
 ALTER TABLE ehr_lookups.cage add cage_type varchar(100);
 
@@ -8114,8 +8096,6 @@ CREATE TABLE ehr_lookups.lookup_sets (
   description varchar(4000)
 );
 
-/* EHR_Lookups-12.312-12.313.sql */
-
 ALTER TABLE ehr_lookups.lookup_sets ADD keyField varchar(100);
 ALTER TABLE ehr_lookups.lookup_sets ADD titleColumn varchar(100);
 
@@ -8127,8 +8107,6 @@ DROP TABLE ehr_lookups.mhc_institutions;
 
 GO
 
-/* EHR_Lookups-12.313-12.314.sql */
-
 --alopecia cause
 INSERT INTO ehr_lookups.lookup_sets (setname, label, keyField)
 VALUES ('alopecia_cause', 'Alopecia Cause', 'value');
@@ -8142,7 +8120,6 @@ FROM ehr_lookups.alopecia_cause;
 
 DROP TABLE ehr_lookups.alopecia_cause;
 
-
 --alopecia_score
 INSERT INTO ehr_lookups.lookup_sets (setname, label, keyField)
 VALUES ('alopecia_score', 'Alopecia Score', 'value');
@@ -9233,12 +9210,8 @@ FROM ehr_lookups.condition_codes;
 
 DROP TABLE ehr_lookups.condition_codes;
 
-/* EHR_Lookups-12.314-12.315.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD countAsPaired bit default 0;
 
-/* EHR_Lookups-12.318-12.319.sql */
-
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Antibiotic Sensitivity');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Biochemistry');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Cerebral Spinal Fluid');
@@ -9246,8 +9219,6 @@ INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Mic
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Occult Blood');
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'Serology');
 
-/* EHR_Lookups-12.319-12.320.sql */
-
 CREATE TABLE ehr_lookups.parentageTypes (
   label varchar(200),
   priority int,
@@ -9263,16 +9234,10 @@ CREATE TABLE ehr_lookups.relationshipTypes (
   gender varchar(100)
 );
 
-/* EHR_Lookups-12.320-12.321.sql */
-
 ALTER TABLE ehr_lookups.ageclass add label varchar(100);
 
-/* EHR_Lookups-12.323-12.324.sql */
-
 ALTER TABLE ehr_lookups.cage_type DROP COLUMN MaxAnimalWeight;
 
-/* EHR_Lookups-12.326-12.327.sql */
-
 CREATE TABLE ehr_lookups.labwork_types (
   type varchar(100) NOT NULL,
   tableName varchar(100),
@@ -9348,8 +9313,6 @@ INSERT INTO ehr_lookups.labwork_types (type, tablename) VALUES ('iStat', 'istat_
 
 INSERT INTO ehr_lookups.lookups (set_name, value) VALUES ('clinpath_types', 'iSTAT');
 
-/* EHR_Lookups-12.328-12.329.sql */
-
 CREATE TABLE ehr_lookups.cage_positions (
   cage varchar(100) NOT NULL,
   row varchar(100),
@@ -9499,8 +9462,6 @@ INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S2', 'S',
 INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S3', 'S', 3);
 INSERT INTO ehr_lookups.cage_positions (cage, row, columnIdx) VALUES ('S4', 'S', 4);
 
-/* EHR_Lookups-12.333-12.334.sql */
-
 ALTER TABLE ehr_lookups.ageclass ADD gender varchar(100);
 
 ALTER TABLE ehr_lookups.cage_positions ADD sort_order int;
@@ -9648,8 +9609,6 @@ UPDATE ehr_lookups.cage_positions SET sort_order=138 WHERE cage='S2';
 UPDATE ehr_lookups.cage_positions SET sort_order=139 WHERE cage='S3';
 UPDATE ehr_lookups.cage_positions SET sort_order=140 WHERE cage='S4';
 
-/* EHR_Lookups-12.336-12.337.sql */
-
 CREATE TABLE ehr_lookups.flag_categories (
   category varchar(100),
   description varchar(4000),
@@ -9672,23 +9631,14 @@ INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('SPF',
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('TB', 0);
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('TMB', 0);
 
-/* EHR_Lookups-12.337-12.338.sql */
-
 --implemented based on SQLServer database engine tuning monitor
 CREATE INDEX cage_cagetype_room_cage ON ehr_lookups.cage (cage_type, room, cage);
 CREATE INDEX cage_cagetype_room_cage_divider_type ON ehr_lookups.cage (room, cage, divider, cage_type);
 
-/* EHR_Lookups-12.338-12.339.sql */
-
 --implemented based on SQLServer database engine tuning monitor
 CREATE INDEX rooms_room_area ON ehr_lookups.rooms (room, area);
 
-/* EHR_Lookups-12.339-12.340.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD displaychar varchar(10);
-
-/* EHR_Lookups-12.340-12.341.sql */
-
 ALTER TABLE ehr_lookups.divider_types ADD bgcolor varchar(100);
 ALTER TABLE ehr_lookups.divider_types ADD border_style varchar(100);
 ALTER TABLE ehr_lookups.divider_types ADD short_description varchar(100);
@@ -9720,83 +9670,60 @@ UPDATE ehr_lookups.divider_types SET border_style = 'solid' WHERE divider = 'Pai
 UPDATE ehr_lookups.divider_types SET short_description = 'MESH' WHERE divider = 'Pairing Mesh Divider';
 UPDATE ehr_lookups.divider_types SET displaychar = '#' WHERE divider = 'Pairing Mesh Divider';
 
-/* EHR_Lookups-12.342-12.343.sql */
-
 CREATE INDEX rooms_sort_order_room ON ehr_lookups.rooms (sort_order, room);
 
 --NOTE: this is different than the SQLServer version
 CREATE INDEX cage_location ON ehr_lookups.cage (location ASC);
 CREATE INDEX rooms_room_sort_order ON ehr_lookups.rooms (room) INCLUDE (sort_order);
 
-/* EHR_Lookups-12.343-12.344.sql */
-
 --NOTE: this is only created on SQLServer since PG doesnt support INCLUDE
 CREATE INDEX snomed_code_include_meaning ON ehr_lookups.snomed (code) INCLUDE (meaning);
 
-/* EHR_Lookups-12.347-12.348.sql */
-
 ALTER TABLE ehr_lookups.species add dateDisabled datetime;
 
-/* EHR_Lookups-12.348-12.349.sql */
-
 DELETE FROM ehr_lookups.snomed_subsets WHERE subset = 'Diet';
 INSERT INTO ehr_lookups.snomed_subsets (subset) VALUES ('Diet');
 
-/* EHR_Lookups-12.349-12.350.sql */
-
 ALTER TABLE ehr_lookups.flag_categories ADD omitFromOverview bit default 0;
 ALTER TABLE ehr_lookups.flag_categories ADD doHighlight bit default 0;
 GO
+
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique, omitFromOverview) values ('Genetics', 0, 1);
 UPDATE ehr_lookups.flag_categories set doHighlight = 0;
 UPDATE ehr_lookups.flag_categories set doHighlight = 1 WHERE category = 'Alert';
 
-/* EHR_Lookups-12.351-12.352.sql */
-
 ALTER TABLE ehr_lookups.procedures ADD genericName varchar(200);
 ALTER TABLE ehr_lookups.procedures ADD incision bit default 0;
 ALTER TABLE ehr_lookups.procedures ADD recoveryDays integer;
 ALTER TABLE ehr_lookups.procedures ADD followupDays integer;
-
 ALTER TABLE ehr_lookups.procedures ADD analgesiaRx integer;
 ALTER TABLE ehr_lookups.procedures ADD antibioticRx integer;
-
-/* EHR_Lookups-12.352-12.353.sql */
-
 ALTER TABLE ehr_lookups.cage_type ADD verticalSlots integer;
 GO
+
 UPDATE ehr_lookups.cage_type SET verticalSlots = 1;
 UPDATE ehr_lookups.cage_type SET verticalSlots = 2 WHERE cagetype LIKE 'Tunnel - %';
-
-/* EHR_Lookups-12.353-12.354.sql */
-
 ALTER TABLE ehr_lookups.cage_type ADD supportsTunnel bit;
 GO
+
 UPDATE ehr_lookups.cage_type SET supportsTunnel = 0;
 UPDATE ehr_lookups.cage_type SET supportsTunnel = 1 WHERE cagetype LIKE 'Tunnel - %';
 ALTER TABLE ehr_lookups.cage_type DROP COLUMN CageCapacity;
-
 ALTER TABLE ehr_lookups.cage ADD hasTunnel bit;
-
-/* EHR_Lookups-12.354-12.355.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_tube_type ADD color varchar(100);
 GO
+
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Purple' WHERE type = 'EDTA';
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Green' WHERE type = 'Heparin';
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Red' WHERE type = 'No Additive';
 UPDATE ehr_lookups.blood_draw_tube_type SET color = 'Striped' WHERE type = 'SST';
 
-/* EHR_Lookups-12.355-12.356.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_services ADD requiredtubetype varchar(100);
 ALTER TABLE ehr_lookups.blood_draw_services ADD minvolume double precision;
 GO
 UPDATE ehr_lookups.blood_draw_services SET requiredtubetype = 'EDTA' WHERE service = 'CBC';
 UPDATE ehr_lookups.blood_draw_services SET requiredtubetype = 'SST' WHERE service = 'Vet-19';
 
-/* EHR_Lookups-12.357-12.358.sql */
-
 CREATE TABLE ehr_lookups.labwork_services (
   servicename varchar(200),
   dataset varchar(200),
@@ -9827,13 +9754,9 @@ GO
 UPDATE ehr_lookups.request_priority SET immediatenotification = 0;
 UPDATE ehr_lookups.request_priority SET immediatenotification = 1 WHERE priority = 'ASAP';
 
-/* EHR_Lookups-12.360-12.361.sql */
-
 ALTER TABLE ehr_lookups.labwork_panels ADD method varchar(200);
 ALTER TABLE ehr_lookups.labwork_panels ADD testfieldname varchar(200);
 
-/* EHR_Lookups-12.362-12.363.sql */
-
 EXEC sp_rename 'ehr_lookups.procedure_default_treatments.concentration_units', 'conc_units', 'COLUMN';
 
 EXEC sp_rename 'ehr_lookups.procedure_default_treatments.volume_units', 'vol_units', 'COLUMN';
@@ -9844,8 +9767,6 @@ UPDATE ehr_lookups.procedure_default_treatments set dosage = null;
 UPDATE ehr_lookups.procedure_default_treatments set amount_units = dosage_units;
 UPDATE ehr_lookups.procedure_default_treatments set dosage_units = null;
 
-/* EHR_Lookups-12.365-12.366.sql */
-
 ALTER TABLE ehr_lookups.snomed_subsets ADD container entityid;
 ALTER TABLE ehr_lookups.snomed_subsets ADD rowid int identity(1,1);
 GO
@@ -9857,13 +9778,8 @@ UPDATE ehr_lookups.snomed_subsets SET container = (SELECT c.entityid from core.c
 DELETE FROM ehr_lookups.snomed_subsets WHERE container IS NULL;
 
 INSERT INTO ehr_lookups.labwork_types (type, tablename) VALUES ('Misc Tests', 'misc_tests');
-
-/* EHR_Lookups-12.366-12.367.sql */
-
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique) VALUES ('Cage Exemptions', 1);
 
-/* EHR_Lookups-12.367-12.368.sql */
-
 ALTER TABLE ehr_lookups.labwork_services DROP column sampletype;
 ALTER TABLE ehr_lookups.labwork_services ADD tissue varchar(100);
 
@@ -9871,43 +9787,27 @@ ALTER TABLE ehr_lookups.cageclass ADD requirementset varchar(200);
 GO
 UPDATE ehr_lookups.cageclass SET requirementset = 'The Guide';
 
-/* EHR_Lookups-12.368-12.369.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD outsidelab bit default 0;
-
-/* EHR_Lookups-12.369-12.370.sql */
-
 ALTER TABLE ehr_lookups.snomed ADD container ENTITYID;
 GO
 --upgrade path for WNPRC
 UPDATE ehr_lookups.snomed SET container = (SELECT c.entityid from core.containers c LEFT JOIN core.Containers c2 on (c.Parent = c2.EntityId) WHERE c.name = 'EHR' and c2.name = 'WNPRC');
 
-/* EHR_Lookups-12.370-12.371.sql */
-
 EXEC core.fn_dropifexists 'snomed', 'ehr_lookups', 'CONSTRAINT', 'PK_snomed';
 ALTER TABLE ehr_lookups.snomed ADD rowid int identity(1,1);
 
 GO
 ALTER TABLE ehr_lookups.snomed ADD CONSTRAINT pk_snomed PRIMARY KEY (rowid);
 
-/* EHR_Lookups-12.374-12.375.sql */
-
 CREATE INDEX snomed_code_container ON ehr_lookups.snomed (code, container);
 CREATE INDEX snomed_subset_codes_container_code ON ehr_lookups.snomed_subset_codes (container, code);
 CREATE INDEX snomed_subset_codes_container_primarycategory ON ehr_lookups.snomed_subset_codes (container, primarycategory);
 
-/* EHR_Lookups-12.375-12.376.sql */
-
 INSERT INTO ehr_lookups.flag_categories (category, enforceUnique, doHighlight) VALUES ('Assign Alias', 1, 1);
 
-/* EHR_Lookups-12.377-12.378.sql */
-
 ALTER TABLE ehr_lookups.procedures ADD remark varchar(8000);
-
 ALTER TABLE ehr_lookups.species ADD cites_code varchar(200);
 
-/* EHR_Lookups-12.380-12.381.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults ADD route varchar(100);
 ALTER TABLE ehr_lookups.drug_defaults ADD frequency int;
 ALTER TABLE ehr_lookups.drug_defaults ADD volume double precision;
@@ -9917,9 +9817,6 @@ ALTER TABLE ehr_lookups.drug_defaults ADD amount_units varchar(100);
 
 ALTER TABLE ehr_lookups.drug_defaults ADD duration double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD offset double precision;
-
-/* EHR_Lookups-12.382-12.383.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults add rowid int identity(1,1);
 ALTER TABLE ehr_lookups.drug_defaults add ageclass varchar(100);
 GO
@@ -9927,53 +9824,31 @@ ALTER TABLE ehr_lookups.drug_defaults DROP CONSTRAINT PK_drug_defaults;
 GO
 ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT PK_drug_defaults PRIMARY KEY (rowid);
 
-/* EHR_Lookups-12.383-12.384.sql */
-
 ALTER TABLE ehr_lookups.blood_draw_services add formtype varchar(100);
 ALTER TABLE ehr_lookups.blood_draw_services add labwork_service varchar(100);
 GO
 UPDATE ehr_lookups.blood_draw_services SET formtype = 'Clinpath Request';
 UPDATE ehr_lookups.blood_draw_services SET labwork_service = service;
 
-/* EHR_Lookups-12.389-12.390.sql */
-
 ALTER TABLE ehr_lookups.drug_defaults ADD category varchar(100);
 ALTER TABLE ehr_lookups.drug_defaults ADD volume_rounding double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD amount_rounding double precision;
 ALTER TABLE ehr_lookups.drug_defaults ADD amount_max double precision;
-
-/* EHR_Lookups-12.390-12.391.sql */
-
 ALTER TABLE ehr_lookups.procedures DROP COLUMN analgesiaRx;
 ALTER TABLE ehr_lookups.procedures DROP COLUMN antibioticRx;
 GO
 ALTER TABLE ehr_lookups.procedures ADD analgesiaRx varchar(200);
 ALTER TABLE ehr_lookups.procedures ADD antibioticRx varchar(200);
 
-/* EHR_Lookups-12.391-12.392.sql */
-
 ALTER TABLE ehr_lookups.treatment_frequency ADD shortname varchar(200);
 ALTER TABLE ehr_lookups.treatment_frequency ADD legacyname varchar(200);
 
-/* EHR_Lookups-12.392-12.393.sql */
-
 ALTER TABLE ehr_lookups.treatment_frequency ADD active bit default 1;
 ALTER TABLE ehr_lookups.treatment_frequency DROP COLUMN legacyname;
-
-/* EHR_Lookups-12.396-12.397.sql */
-
 ALTER TABLE ehr_lookups.procedures add timeOfMeds varchar(200);
-
-/* EHR_Lookups-12.398-12.399.sql */
-
 ALTER TABLE ehr_lookups.lookups add category varchar(200);
-
-/* EHR_Lookups-12.399-12.400.sql */
-
 ALTER TABLE ehr_lookups.cage ADD status VARCHAR(200);
 
-/* EHR_Lookups-12.401-12.402.sql */
-
 CREATE TABLE ehr_lookups.flag_values (
     rowid int identity(1,1),
     category varchar(100),
@@ -9989,8 +9864,6 @@ CREATE TABLE ehr_lookups.flag_values (
 
 ALTER TABLE ehr_lookups.procedures DROP COLUMN timeofmeds;
 
-/* EHR_Lookups-12.405-12.406.sql */
-
 DROP TABLE ehr_lookups.flag_values;
 GO
 CREATE TABLE ehr_lookups.flag_values (
@@ -10011,12 +9884,8 @@ CREATE TABLE ehr_lookups.flag_values (
     CONSTRAINT PK_flag_values PRIMARY KEY (rowid)
 );
 
-/* EHR_Lookups-12.406-12.407.sql */
-
 UPDATE ehr_lookups.lookup_sets SET keyField = 'value' WHERE setname = 'birth_condition';
 
-/* EHR_Lookups-12.407-12.408.sql */
-
 delete from ehr_lookups.cage_positions where row = 'N';
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('N1', 'N', 1, 137);
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('N2', 'N', 2, 138);
@@ -10033,8 +9902,6 @@ insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('S3', 'S', 1, 148);
 insert into ehr_lookups.cage_positions (cage, row, columnIdx, sort_order) values ('S4', 'S', 1, 149);
 
-/* EHR_Lookups-12.408-12.409.sql */
-
 alter table ehr_lookups.divider_types add datedisabled datetime;
 alter table ehr_lookups.divider_types add isMoveable bit default 1;
 GO
@@ -10050,16 +9917,12 @@ update ehr_lookups.cage_type  set abbreviation = 'T' WHERE cagetype like '%T';
 insert into ehr_lookups.divider_types (divider, countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, isMoveable)
 select 'Cage Wall (Solid)', countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, 0 from ehr_lookups.divider_types where divider = 'Solid Divider';
 
-/* EHR_Lookups-12.409-12.410.sql */
-
 CREATE INDEX IDX_snomed_container_code_rowid ON ehr_lookups.snomed (container, code, rowid);
 
 --stats, sql server only
 CREATE STATISTICS STATS_snomed_rowid_container_code ON ehr_lookups.snomed (rowid, container, code);
 CREATE STATISTICS STATS_snomed_code_rowid ON ehr_lookups.snomed (code, rowid);
 
-/* EHR_Lookups-12.410-12.411.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD datedisabled datetime;
 
 UPDATE ehr_lookups.divider_types SET divider = 'Cage Wall (Solid)' WHERE divider = 'Cage Well (Solid)';
@@ -10067,8 +9930,6 @@ UPDATE ehr_lookups.divider_types SET divider = 'Cage Wall (Solid)' WHERE divider
 insert into ehr_lookups.divider_types (divider, countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, isMoveable)
 select 'Feeder Slide', countAsSeparate, countAsPaired, displaychar, bgcolor, border_style, short_description, 1 from ehr_lookups.divider_types where divider = 'Solid Divider';
 
-/* EHR_Lookups-12.411-12.412.sql */
-
 DROP TABLE ehr_lookups.flag_values;
 
 CREATE TABLE ehr_lookups.flag_values (
@@ -10090,35 +9951,19 @@ CREATE TABLE ehr_lookups.flag_values (
     CONSTRAINT PK_flag_values PRIMARY KEY (objectid)
 );
 
-/* EHR_Lookups-12.412-12.413.sql */
-
 DROP TABLE ehr_lookups.animal_condition;
 
-/* EHR_Lookups-12.413-12.414.sql */
-
 ALTER TABLE ehr_lookups.labwork_services ADD method varchar(100);
 
-/* EHR_Lookups-12.414-12.415.sql */
-
 UPDATE ehr_lookups.lookups SET set_name = 'housingDefinition' WHERE set_name = 'LocationDefinition';
 UPDATE ehr_lookups.lookups SET set_name = 'housingTypes' WHERE set_name = 'LocationType';
 
-/* EHR_Lookups-12.417-12.418.sql */
-
 DROP INDEX rooms_sort_order_room ON ehr_lookups.rooms;
 
 CREATE INDEX ehr_lookups_set_name_value ON ehr_lookups.lookups (set_name, value);
-
-/* EHR_Lookups-12.420-12.421.sql */
-
 CREATE INDEX IDX_rooms_area_room ON ehr_lookups.rooms (area, room);
 
-/* EHR_Lookups-12.422-12.423.sql */
-
 ALTER TABLE ehr_lookups.snomed_subsets ADD description VARCHAR(4000);
-
-/* EHR_Lookups-12.423-12.424.sql */
-
 ALTER TABLE ehr_lookups.lookup_sets ADD rowid int identity(1,1);
 ALTER TABLE ehr_lookups.lookup_sets ADD container entityid;
 ALTER TABLE ehr_lookups.lookups ADD container entityid;
@@ -10137,8 +9982,6 @@ UPDATE ehr_lookups.lookups SET container = (SELECT c.entityid from core.containe
 DELETE FROM ehr_lookups.lookup_sets WHERE container IS NULL;
 DELETE FROM ehr_lookups.lookups WHERE container IS NULL;
 
-/* EHR_Lookups-12.424-12.425.sql */
-
 EXEC core.fn_dropifexists 'handleUpgrade', 'ehr', 'PROCEDURE';
 GO
 
@@ -10287,4 +10130,414 @@ CREATE INDEX IX_geographic_origins_Container ON ehr_lookups.geographic_origins (
 CREATE INDEX IX_rooms_Container ON ehr_lookups.rooms (Container);
 CREATE INDEX IX_buildings_Container ON ehr_lookups.buildings (Container);
 CREATE INDEX IX_treatment_codes_Container ON ehr_lookups.treatment_codes (Container);
+GO
+
+/* ehr_lookups-18.10-18.20.sql */
+
+-- add Container column to the ehr/ehr_lookups tables (values to be populated in Java upgrade script)
+ALTER TABLE ehr.protocolProcedures ADD Container ENTITYID;
+ALTER TABLE ehr.scheduled_task_types ADD Container ENTITYID;
+GO
+
+ALTER TABLE ehr.protocolProcedures ADD CONSTRAINT FK_ehr_protocolProcedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr.scheduled_task_types ADD CONSTRAINT FK_ehr_scheduled_task_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+GO
+
+ALTER TABLE ehr_lookups.ageclass ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.amount_units ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.areas ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.billingtypes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_draw_services ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.cage ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.cage_positions ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.cage_type ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.cageclass ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.calculated_status_codes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.clinpath_status ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.clinpath_tests ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.conc_units ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.death_remarks ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.disallowed_medications ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.divider_types ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.dosage_units ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.drug_defaults ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.flag_categories ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.full_snomed ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.gender_codes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.lab_test_range ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.lab_tests ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_panels ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_services ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.labwork_types ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.note_types ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.parentageTypes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_charges ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_codes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_comments ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_flags ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedure_default_treatments ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.procedures ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.project_types ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.relationshipTypes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.request_priority ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.restraint_type ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.routes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.snomap ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.source ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.species ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.species_codes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.treatment_frequency ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.treatment_frequency_times ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.usda_codes ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.usda_levels ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.volume_units ADD Container ENTITYID;
+ALTER TABLE ehr_lookups.weight_ranges ADD Container ENTITYID;
+GO
+
+-- add the FK for those Container columns
+ALTER TABLE ehr_lookups.ageclass ADD CONSTRAINT FK_ehr_lookups_ageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT FK_ehr_lookups_amount_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.areas ADD CONSTRAINT FK_ehr_lookups_areas_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.billingtypes ADD CONSTRAINT FK_ehr_lookups_billingtypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT FK_ehr_lookups_blood_draw_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT FK_ehr_lookups_blood_draw_tube_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT FK_ehr_lookups_blood_tube_volumes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage ADD CONSTRAINT FK_ehr_lookups_cage_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT FK_ehr_lookups_cage_positions_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT FK_ehr_lookups_cage_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.cageclass ADD CONSTRAINT FK_ehr_lookups_cageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT FK_ehr_lookups_calculated_status_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.clinpath_status ADD CONSTRAINT FK_ehr_lookups_clinpath_status_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT FK_ehr_lookups_clinpath_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT FK_ehr_lookups_conc_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT FK_ehr_lookups_death_remarks_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.disallowed_medications ADD CONSTRAINT FK_ehr_lookups_disallowed_medications_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.divider_types ADD CONSTRAINT FK_ehr_lookups_divider_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT FK_ehr_lookups_dosage_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT FK_ehr_lookups_drug_defaults_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT FK_ehr_lookups_flag_categories_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.full_snomed ADD CONSTRAINT FK_ehr_lookups_full_snomed_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT FK_ehr_lookups_gender_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.lab_test_range ADD CONSTRAINT FK_ehr_lookups_lab_test_range_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.lab_tests ADD CONSTRAINT FK_ehr_lookups_lab_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_panels ADD CONSTRAINT FK_ehr_lookups_labwork_panels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT FK_ehr_lookups_labwork_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT FK_ehr_lookups_labwork_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.note_types ADD CONSTRAINT FK_ehr_lookups_note_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT FK_ehr_lookups_parentageTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_charges ADD CONSTRAINT FK_ehr_lookups_procedure_default_charges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_codes ADD CONSTRAINT FK_ehr_lookups_procedure_default_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_comments ADD CONSTRAINT FK_ehr_lookups_procedure_default_comments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_flags ADD CONSTRAINT FK_ehr_lookups_procedure_default_flags_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedure_default_treatments ADD CONSTRAINT FK_ehr_lookups_procedure_default_treatments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.procedures ADD CONSTRAINT FK_ehr_lookups_procedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.project_types ADD CONSTRAINT FK_ehr_lookups_project_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.relationshipTypes ADD CONSTRAINT FK_ehr_lookups_relationshipTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT FK_ehr_lookups_request_priority_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT FK_ehr_lookups_restraint_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.routes ADD CONSTRAINT FK_ehr_lookups_routes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.snomap ADD CONSTRAINT FK_ehr_lookups_snomap_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.source ADD CONSTRAINT FK_ehr_lookups_source_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.species ADD CONSTRAINT FK_ehr_lookups_species_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT FK_ehr_lookups_species_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.treatment_frequency ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.treatment_frequency_times ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_times_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.usda_codes ADD CONSTRAINT FK_ehr_lookups_usda_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT FK_ehr_lookups_usda_levels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT FK_ehr_lookups_volume_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT FK_ehr_lookups_weight_ranges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
+GO
+
+-- remove any NULL rows for Container
+DELETE FROM ehr.protocolProcedures WHERE Container IS NULL;
+DELETE FROM ehr.scheduled_task_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.ageclass WHERE Container IS NULL;
+DELETE FROM ehr_lookups.amount_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.areas WHERE Container IS NULL;
+DELETE FROM ehr_lookups.billingtypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_draw_services WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_draw_tube_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.blood_tube_volumes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage_positions WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cage_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.cageclass WHERE Container IS NULL;
+DELETE FROM ehr_lookups.calculated_status_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.clinpath_status WHERE Container IS NULL;
+DELETE FROM ehr_lookups.clinpath_tests WHERE Container IS NULL;
+DELETE FROM ehr_lookups.conc_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.death_remarks WHERE Container IS NULL;
+DELETE FROM ehr_lookups.disallowed_medications WHERE Container IS NULL;
+DELETE FROM ehr_lookups.divider_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.dosage_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.drug_defaults WHERE Container IS NULL;
+DELETE FROM ehr_lookups.flag_categories WHERE Container IS NULL;
+DELETE FROM ehr_lookups.full_snomed WHERE Container IS NULL;
+DELETE FROM ehr_lookups.gender_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.lab_test_range WHERE Container IS NULL;
+DELETE FROM ehr_lookups.lab_tests WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_panels WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_services WHERE Container IS NULL;
+DELETE FROM ehr_lookups.labwork_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.note_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.parentageTypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_charges WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_comments WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_flags WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedure_default_treatments WHERE Container IS NULL;
+DELETE FROM ehr_lookups.procedures WHERE Container IS NULL;
+DELETE FROM ehr_lookups.project_types WHERE Container IS NULL;
+DELETE FROM ehr_lookups.relationshipTypes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.request_priority WHERE Container IS NULL;
+DELETE FROM ehr_lookups.restraint_type WHERE Container IS NULL;
+DELETE FROM ehr_lookups.routes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.snomap WHERE Container IS NULL;
+DELETE FROM ehr_lookups.source WHERE Container IS NULL;
+DELETE FROM ehr_lookups.species WHERE Container IS NULL;
+DELETE FROM ehr_lookups.species_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.treatment_frequency WHERE Container IS NULL;
+DELETE FROM ehr_lookups.treatment_frequency_times WHERE Container IS NULL;
+DELETE FROM ehr_lookups.usda_codes WHERE Container IS NULL;
+DELETE FROM ehr_lookups.usda_levels WHERE Container IS NULL;
+DELETE FROM ehr_lookups.volume_units WHERE Container IS NULL;
+DELETE FROM ehr_lookups.weight_ranges WHERE Container IS NULL;
+GO
+
+--set NOT NULL constraint for the Container columns
+ALTER TABLE ehr.protocolProcedures ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr.scheduled_task_types ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.ageclass ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.amount_units ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.areas ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.billingtypes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.blood_draw_services ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.blood_draw_tube_type ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.blood_tube_volumes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.cage ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.cage_positions ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.cage_type ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.cageclass ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.calculated_status_codes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.clinpath_status ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.clinpath_tests ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.conc_units ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.death_remarks ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.disallowed_medications ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.divider_types ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.dosage_units ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.drug_defaults ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.flag_categories ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.full_snomed ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.gender_codes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.lab_test_range ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.lab_tests ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.labwork_panels ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.labwork_services ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.labwork_types ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.note_types ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.parentageTypes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_charges ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_codes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_comments ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_flags ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedure_default_treatments ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.procedures ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.project_types ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.relationshipTypes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.request_priority ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.restraint_type ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.routes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.snomap ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.source ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.species ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.species_codes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.treatment_frequency ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.treatment_frequency_times ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.usda_codes ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.usda_levels ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.volume_units ALTER COLUMN Container ENTITYID NOT NULL;
+ALTER TABLE ehr_lookups.weight_ranges ALTER COLUMN Container ENTITYID NOT NULL;
+GO
+
+-- add the INDEX for those Container columns
+CREATE INDEX IX_ehr_protocolProcedures_Container ON ehr.protocolProcedures (Container);
+CREATE INDEX IX_ehr_scheduled_task_types_Container ON ehr.scheduled_task_types (Container);
+CREATE INDEX IX_ehr_lookups_ageclass_Container ON ehr_lookups.ageclass (Container);
+CREATE INDEX IX_ehr_lookups_amount_units_Container ON ehr_lookups.amount_units (Container);
+CREATE INDEX IX_ehr_lookups_areas_Container ON ehr_lookups.areas (Container);
+CREATE INDEX IX_ehr_lookups_billingtypes_Container ON ehr_lookups.billingtypes (Container);
+CREATE INDEX IX_ehr_lookups_blood_draw_services_Container ON ehr_lookups.blood_draw_services (Container);
+CREATE INDEX IX_ehr_lookups_blood_draw_tube_type_Container ON ehr_lookups.blood_draw_tube_type (Container);
+CREATE INDEX IX_ehr_lookups_blood_tube_volumes_Container ON ehr_lookups.blood_tube_volumes (Container);
+CREATE INDEX IX_ehr_lookups_cage_Container ON ehr_lookups.cage (Container);
+CREATE INDEX IX_ehr_lookups_cage_positions_Container ON ehr_lookups.cage_positions (Container);
+CREATE INDEX IX_ehr_lookups_cage_type_Container ON ehr_lookups.cage_type (Container);
+CREATE INDEX IX_ehr_lookups_cageclass_Container ON ehr_lookups.cageclass (Container);
+CREATE INDEX IX_ehr_lookups_calculated_status_codes_Container ON ehr_lookups.calculated_status_codes (Container);
+CREATE INDEX IX_ehr_lookups_clinpath_status_Container ON ehr_lookups.clinpath_status (Container);
+CREATE INDEX IX_ehr_lookups_clinpath_tests_Container ON ehr_lookups.clinpath_tests (Container);
+CREATE INDEX IX_ehr_lookups_conc_units_Container ON ehr_lookups.conc_units (Container);
+CREATE INDEX IX_ehr_lookups_death_remarks_Container ON ehr_lookups.death_remarks (Container);
+CREATE INDEX IX_ehr_lookups_disallowed_medications_Container ON ehr_lookups.disallowed_medications (Container);
+CREATE INDEX IX_ehr_lookups_divider_types_Container ON ehr_lookups.divider_types (Container);
+CREATE INDEX IX_ehr_lookups_dosage_units_Container ON ehr_lookups.dosage_units (Container);
+CREATE INDEX IX_ehr_lookups_drug_defaults_Container ON ehr_lookups.drug_defaults (Container);
+CREATE INDEX IX_ehr_lookups_flag_categories_Container ON ehr_lookups.flag_categories (Container);
+CREATE INDEX IX_ehr_lookups_full_snomed_Container ON ehr_lookups.full_snomed (Container);
+CREATE INDEX IX_ehr_lookups_gender_codes_Container ON ehr_lookups.gender_codes (Container);
+CREATE INDEX IX_ehr_lookups_lab_test_range_Container ON ehr_lookups.lab_test_range (Container);
+CREATE INDEX IX_ehr_lookups_lab_tests_Container ON ehr_lookups.lab_tests (Container);
+CREATE INDEX IX_ehr_lookups_labwork_panels_Container ON ehr_lookups.labwork_panels (Container);
+CREATE INDEX IX_ehr_lookups_labwork_services_Container ON ehr_lookups.labwork_services (Container);
+CREATE INDEX IX_ehr_lookups_labwork_types_Container ON ehr_lookups.labwork_types (Container);
+CREATE INDEX IX_ehr_lookups_note_types_Container ON ehr_lookups.note_types (Container);
+CREATE INDEX IX_ehr_lookups_parentageTypes_Container ON ehr_lookups.parentageTypes (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_charges_Container ON ehr_lookups.procedure_default_charges (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_codes_Container ON ehr_lookups.procedure_default_codes (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_comments_Container ON ehr_lookups.procedure_default_comments (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_flags_Container ON ehr_lookups.procedure_default_flags (Container);
+CREATE INDEX IX_ehr_lookups_procedure_default_treatments_Container ON ehr_lookups.procedure_default_treatments (Container);
+CREATE INDEX IX_ehr_lookups_procedures_Container ON ehr_lookups.procedures (Container);
+CREATE INDEX IX_ehr_lookups_project_types_Container ON ehr_lookups.project_types (Container);
+CREATE INDEX IX_ehr_lookups_relationshipTypes_Container ON ehr_lookups.relationshipTypes (Container);
+CREATE INDEX IX_ehr_lookups_request_priority_Container ON ehr_lookups.request_priority (Container);
+CREATE INDEX IX_ehr_lookups_restraint_type_Container ON ehr_lookups.restraint_type (Container);
+CREATE INDEX IX_ehr_lookups_routes_Container ON ehr_lookups.routes (Container);
+CREATE INDEX IX_ehr_lookups_snomap_Container ON ehr_lookups.snomap (Container);
+CREATE INDEX IX_ehr_lookups_source_Container ON ehr_lookups.source (Container);
+CREATE INDEX IX_ehr_lookups_species_Container ON ehr_lookups.species (Container);
+CREATE INDEX IX_ehr_lookups_species_codes_Container ON ehr_lookups.species_codes (Container);
+CREATE INDEX IX_ehr_lookups_treatment_frequency_Container ON ehr_lookups.treatment_frequency (Container);
+CREATE INDEX IX_ehr_lookups_treatment_frequency_times_Container ON ehr_lookups.treatment_frequency_times (Container);
+CREATE INDEX IX_ehr_lookups_usda_codes_Container ON ehr_lookups.usda_codes (Container);
+CREATE INDEX IX_ehr_lookups_usda_levels_Container ON ehr_lookups.usda_levels (Container);
+CREATE INDEX IX_ehr_lookups_volume_units_Container ON ehr_lookups.volume_units (Container);
+CREATE INDEX IX_ehr_lookups_weight_ranges_Container ON ehr_lookups.weight_ranges (Container);
+GO
+
+-- add new RowId PK column and per-container unique constraints
+ALTER TABLE ehr_lookups.calculated_status_codes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.calculated_status_codes DROP CONSTRAINT PK_calculated_status_codes;
+ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT PK_calculated_status_codes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT UQ_calculated_status_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.gender_codes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.gender_codes DROP CONSTRAINT PK_gender_codes;
+ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT PK_gender_codes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT UQ_gender_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.routes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.routes DROP CONSTRAINT PK_routes;
+ALTER TABLE ehr_lookups.routes ADD CONSTRAINT PK_routes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.routes ADD CONSTRAINT UQ_routes UNIQUE (Container,Route);
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.blood_draw_tube_type DROP CONSTRAINT PK_blood_draw_tube_type;
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT PK_blood_draw_tube_type PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT UQ_blood_draw_tube_type UNIQUE (Container,Type);
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.blood_tube_volumes DROP CONSTRAINT PK_blood_tube_volumes;
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT PK_blood_tube_volumes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT UQ_blood_tube_volumes UNIQUE (Container,Volume);
+ALTER TABLE ehr_lookups.blood_draw_services ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.blood_draw_services DROP CONSTRAINT PK_blood_draw_services;
+ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT PK_blood_draw_services PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT UQ_blood_draw_services UNIQUE (Container,Service);
+ALTER TABLE ehr_lookups.dosage_units ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.dosage_units DROP CONSTRAINT PK_dosage_units;
+ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT PK_dosage_units PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT UQ_dosage_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.conc_units ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.conc_units DROP CONSTRAINT PK_conc_units;
+ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT PK_conc_units PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT UQ_conc_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.volume_units ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.volume_units DROP CONSTRAINT PK_volume_units;
+ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT PK_volume_units PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT UQ_volume_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.amount_units ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.amount_units DROP CONSTRAINT PK_amount_units;
+ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT PK_amount_units PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT UQ_amount_units UNIQUE (Container,Unit);
+ALTER TABLE ehr_lookups.flag_categories ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.flag_categories DROP CONSTRAINT PK_flag_categories;
+ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT PK_flag_categories PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT UQ_flag_categories UNIQUE (Container,Category);
+ALTER TABLE ehr_lookups.weight_ranges ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.weight_ranges DROP CONSTRAINT PK_weight_ranges;
+ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT PK_weight_ranges PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT UQ_weight_ranges UNIQUE (Container,Species);
+ALTER TABLE ehr_lookups.species ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.species DROP CONSTRAINT PK_species;
+ALTER TABLE ehr_lookups.species ADD CONSTRAINT PK_species PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.species ADD CONSTRAINT UQ_species UNIQUE (Container,Common);
+ALTER TABLE ehr_lookups.species_codes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.species_codes DROP CONSTRAINT PK_species_codes;
+ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT PK_species_codes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT UQ_species_codes UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.parentageTypes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT PK_parentageTypes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT UQ_parentageTypes UNIQUE (Container,Label);
+ALTER TABLE ehr_lookups.labwork_services ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.labwork_services DROP CONSTRAINT PK_labwork_services;
+ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT PK_labwork_services PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT UQ_labwork_services UNIQUE (Container,ServiceName);
+ALTER TABLE ehr_lookups.source ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.source DROP CONSTRAINT PK_source;
+ALTER TABLE ehr_lookups.source ADD CONSTRAINT PK_source PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.source ADD CONSTRAINT UQ_source UNIQUE (Container,Code);
+ALTER TABLE ehr_lookups.usda_levels ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.usda_levels DROP CONSTRAINT PK_usda_levels;
+ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT PK_usda_levels PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT UQ_usda_levels UNIQUE (Container,usda_level);
+ALTER TABLE ehr_lookups.areas ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.areas DROP CONSTRAINT PK_areas;
+ALTER TABLE ehr_lookups.areas ADD CONSTRAINT PK_areas PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.areas ADD CONSTRAINT UQ_areas UNIQUE (Container,Area);
+ALTER TABLE ehr_lookups.cage_positions ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.cage_positions DROP CONSTRAINT PK_cage_positions;
+ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT PK_cage_positions PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT UQ_cage_positions UNIQUE (Container,Cage);
+ALTER TABLE ehr_lookups.clinpath_tests ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.clinpath_tests DROP CONSTRAINT PK_testname;
+ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT PK_clinpath_tests PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT UQ_clinpath_tests UNIQUE (Container,TestName);
+ALTER TABLE ehr_lookups.death_remarks ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.death_remarks DROP CONSTRAINT PK_death_remarks;
+ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT PK_death_remarks PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT UQ_death_remarks UNIQUE (Container,Title);
+ALTER TABLE ehr_lookups.request_priority ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.request_priority DROP CONSTRAINT PK_request_priority;
+ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT PK_request_priority PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT UQ_request_priority UNIQUE (Container,Priority);
+ALTER TABLE ehr_lookups.restraint_type ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.restraint_type DROP CONSTRAINT PK_restraint_type;
+ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT PK_restraint_type PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT UQ_restraint_type UNIQUE (Container,Type);
+ALTER TABLE ehr_lookups.labwork_types ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.labwork_types DROP CONSTRAINT PK_labwork_types;
+ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT PK_labwork_types PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT UQ_labwork_types UNIQUE (Container,Type);
+GO
+
+-- add new RowId PK column and per-container unique constraints
+ALTER TABLE ehr_lookups.treatment_codes ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.treatment_codes DROP CONSTRAINT PK_treatment_codes;
+ALTER TABLE ehr_lookups.treatment_codes ADD CONSTRAINT PK_treatment_codes PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.treatment_codes ADD CONSTRAINT UQ_treatment_codes UNIQUE (Container,Meaning);
+ALTER TABLE ehr_lookups.buildings ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.buildings DROP CONSTRAINT PK_buildings;
+ALTER TABLE ehr_lookups.buildings ADD CONSTRAINT PK_buildings PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.buildings ADD CONSTRAINT UQ_buildings UNIQUE (Container,Name);
+ALTER TABLE ehr_lookups.rooms ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.rooms DROP CONSTRAINT PK_rooms;
+ALTER TABLE ehr_lookups.rooms ADD CONSTRAINT PK_rooms PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.rooms ADD CONSTRAINT UQ_rooms UNIQUE (Container,Room);
+ALTER TABLE ehr_lookups.cage DROP CONSTRAINT PK_cage;
+ALTER TABLE ehr_lookups.cage ADD CONSTRAINT PK_cage PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.cage ADD CONSTRAINT UQ_cage UNIQUE (Container,Location);
+ALTER TABLE ehr_lookups.cage_type ADD RowId INT IDENTITY(1, 1);
+ALTER TABLE ehr_lookups.cage_type DROP CONSTRAINT PK_cage_type;
+ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT PK_cage_type PRIMARY KEY (RowId);
+ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT UQ_cage_type UNIQUE (Container,CageType);
 GO
\ No newline at end of file
diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-18.10-18.20.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-18.10-18.20.sql
deleted file mode 100644
index d89d5a972..000000000
--- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-18.10-18.20.sql
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) 2018-2019 LabKey Corporation
- *
- * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
- */
-/* ehr_lookups-18.10-18.11.sql */
-
--- add Container column to the ehr/ehr_lookups tables (values to be populated in Java upgrade script)
-ALTER TABLE ehr.protocolProcedures ADD Container ENTITYID;
-ALTER TABLE ehr.scheduled_task_types ADD Container ENTITYID;
-GO
-
-ALTER TABLE ehr.protocolProcedures ADD CONSTRAINT FK_ehr_protocolProcedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr.scheduled_task_types ADD CONSTRAINT FK_ehr_scheduled_task_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-GO
-
-EXEC core.executeJavaUpgradeCode 'setEhrContainerFirstSet';
-GO
-
-ALTER TABLE ehr_lookups.ageclass ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.amount_units ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.areas ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.billingtypes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_draw_services ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.cage ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.cage_positions ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.cage_type ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.cageclass ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.calculated_status_codes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.clinpath_status ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.clinpath_tests ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.conc_units ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.death_remarks ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.disallowed_medications ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.divider_types ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.dosage_units ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.drug_defaults ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.flag_categories ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.full_snomed ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.gender_codes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.lab_test_range ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.lab_tests ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_panels ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_services ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.labwork_types ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.note_types ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.parentageTypes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_charges ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_codes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_comments ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_flags ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedure_default_treatments ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.procedures ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.project_types ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.relationshipTypes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.request_priority ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.restraint_type ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.routes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.snomap ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.source ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.species ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.species_codes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.treatment_frequency ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.treatment_frequency_times ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.usda_codes ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.usda_levels ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.volume_units ADD Container ENTITYID;
-ALTER TABLE ehr_lookups.weight_ranges ADD Container ENTITYID;
-GO
-
--- add the FK for those Container columns
-ALTER TABLE ehr_lookups.ageclass ADD CONSTRAINT FK_ehr_lookups_ageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT FK_ehr_lookups_amount_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.areas ADD CONSTRAINT FK_ehr_lookups_areas_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.billingtypes ADD CONSTRAINT FK_ehr_lookups_billingtypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT FK_ehr_lookups_blood_draw_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT FK_ehr_lookups_blood_draw_tube_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT FK_ehr_lookups_blood_tube_volumes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage ADD CONSTRAINT FK_ehr_lookups_cage_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT FK_ehr_lookups_cage_positions_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT FK_ehr_lookups_cage_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.cageclass ADD CONSTRAINT FK_ehr_lookups_cageclass_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT FK_ehr_lookups_calculated_status_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.clinpath_status ADD CONSTRAINT FK_ehr_lookups_clinpath_status_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT FK_ehr_lookups_clinpath_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT FK_ehr_lookups_conc_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT FK_ehr_lookups_death_remarks_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.disallowed_medications ADD CONSTRAINT FK_ehr_lookups_disallowed_medications_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.divider_types ADD CONSTRAINT FK_ehr_lookups_divider_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT FK_ehr_lookups_dosage_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.drug_defaults ADD CONSTRAINT FK_ehr_lookups_drug_defaults_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT FK_ehr_lookups_flag_categories_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.full_snomed ADD CONSTRAINT FK_ehr_lookups_full_snomed_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT FK_ehr_lookups_gender_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.lab_test_range ADD CONSTRAINT FK_ehr_lookups_lab_test_range_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.lab_tests ADD CONSTRAINT FK_ehr_lookups_lab_tests_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_panels ADD CONSTRAINT FK_ehr_lookups_labwork_panels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT FK_ehr_lookups_labwork_services_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT FK_ehr_lookups_labwork_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.note_types ADD CONSTRAINT FK_ehr_lookups_note_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT FK_ehr_lookups_parentageTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_charges ADD CONSTRAINT FK_ehr_lookups_procedure_default_charges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_codes ADD CONSTRAINT FK_ehr_lookups_procedure_default_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_comments ADD CONSTRAINT FK_ehr_lookups_procedure_default_comments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_flags ADD CONSTRAINT FK_ehr_lookups_procedure_default_flags_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedure_default_treatments ADD CONSTRAINT FK_ehr_lookups_procedure_default_treatments_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.procedures ADD CONSTRAINT FK_ehr_lookups_procedures_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.project_types ADD CONSTRAINT FK_ehr_lookups_project_types_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.relationshipTypes ADD CONSTRAINT FK_ehr_lookups_relationshipTypes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT FK_ehr_lookups_request_priority_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT FK_ehr_lookups_restraint_type_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.routes ADD CONSTRAINT FK_ehr_lookups_routes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.snomap ADD CONSTRAINT FK_ehr_lookups_snomap_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.source ADD CONSTRAINT FK_ehr_lookups_source_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.species ADD CONSTRAINT FK_ehr_lookups_species_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT FK_ehr_lookups_species_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.treatment_frequency ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.treatment_frequency_times ADD CONSTRAINT FK_ehr_lookups_treatment_frequency_times_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.usda_codes ADD CONSTRAINT FK_ehr_lookups_usda_codes_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT FK_ehr_lookups_usda_levels_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT FK_ehr_lookups_volume_units_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT FK_ehr_lookups_weight_ranges_Container FOREIGN KEY (Container) REFERENCES core.Containers(EntityId);
-GO
-
--- Java upgrade script to populate the Container column from site-level EHRStudyContainer module property
-EXEC core.executeJavaUpgradeCode 'setEhrLookupsContainerSecondSet';
-GO
-
--- remove any NULL rows for Container
-DELETE FROM ehr.protocolProcedures WHERE Container IS NULL;
-DELETE FROM ehr.scheduled_task_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.ageclass WHERE Container IS NULL;
-DELETE FROM ehr_lookups.amount_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.areas WHERE Container IS NULL;
-DELETE FROM ehr_lookups.billingtypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_draw_services WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_draw_tube_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.blood_tube_volumes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage_positions WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cage_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.cageclass WHERE Container IS NULL;
-DELETE FROM ehr_lookups.calculated_status_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.clinpath_status WHERE Container IS NULL;
-DELETE FROM ehr_lookups.clinpath_tests WHERE Container IS NULL;
-DELETE FROM ehr_lookups.conc_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.death_remarks WHERE Container IS NULL;
-DELETE FROM ehr_lookups.disallowed_medications WHERE Container IS NULL;
-DELETE FROM ehr_lookups.divider_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.dosage_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.drug_defaults WHERE Container IS NULL;
-DELETE FROM ehr_lookups.flag_categories WHERE Container IS NULL;
-DELETE FROM ehr_lookups.full_snomed WHERE Container IS NULL;
-DELETE FROM ehr_lookups.gender_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.lab_test_range WHERE Container IS NULL;
-DELETE FROM ehr_lookups.lab_tests WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_panels WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_services WHERE Container IS NULL;
-DELETE FROM ehr_lookups.labwork_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.note_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.parentageTypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_charges WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_comments WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_flags WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedure_default_treatments WHERE Container IS NULL;
-DELETE FROM ehr_lookups.procedures WHERE Container IS NULL;
-DELETE FROM ehr_lookups.project_types WHERE Container IS NULL;
-DELETE FROM ehr_lookups.relationshipTypes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.request_priority WHERE Container IS NULL;
-DELETE FROM ehr_lookups.restraint_type WHERE Container IS NULL;
-DELETE FROM ehr_lookups.routes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.snomap WHERE Container IS NULL;
-DELETE FROM ehr_lookups.source WHERE Container IS NULL;
-DELETE FROM ehr_lookups.species WHERE Container IS NULL;
-DELETE FROM ehr_lookups.species_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.treatment_frequency WHERE Container IS NULL;
-DELETE FROM ehr_lookups.treatment_frequency_times WHERE Container IS NULL;
-DELETE FROM ehr_lookups.usda_codes WHERE Container IS NULL;
-DELETE FROM ehr_lookups.usda_levels WHERE Container IS NULL;
-DELETE FROM ehr_lookups.volume_units WHERE Container IS NULL;
-DELETE FROM ehr_lookups.weight_ranges WHERE Container IS NULL;
-GO
-
---set NOT NULL constraint for the Container columns
-ALTER TABLE ehr.protocolProcedures ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr.scheduled_task_types ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.ageclass ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.amount_units ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.areas ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.billingtypes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.blood_draw_services ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.blood_draw_tube_type ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.blood_tube_volumes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.cage ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.cage_positions ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.cage_type ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.cageclass ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.calculated_status_codes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.clinpath_status ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.clinpath_tests ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.conc_units ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.death_remarks ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.disallowed_medications ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.divider_types ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.dosage_units ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.drug_defaults ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.flag_categories ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.full_snomed ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.gender_codes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.lab_test_range ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.lab_tests ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.labwork_panels ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.labwork_services ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.labwork_types ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.note_types ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.parentageTypes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_charges ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_codes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_comments ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_flags ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedure_default_treatments ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.procedures ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.project_types ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.relationshipTypes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.request_priority ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.restraint_type ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.routes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.snomap ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.source ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.species ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.species_codes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.treatment_frequency ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.treatment_frequency_times ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.usda_codes ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.usda_levels ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.volume_units ALTER COLUMN Container ENTITYID NOT NULL;
-ALTER TABLE ehr_lookups.weight_ranges ALTER COLUMN Container ENTITYID NOT NULL;
-GO
-
--- add the INDEX for those Container columns
-CREATE INDEX IX_ehr_protocolProcedures_Container ON ehr.protocolProcedures (Container);
-CREATE INDEX IX_ehr_scheduled_task_types_Container ON ehr.scheduled_task_types (Container);
-CREATE INDEX IX_ehr_lookups_ageclass_Container ON ehr_lookups.ageclass (Container);
-CREATE INDEX IX_ehr_lookups_amount_units_Container ON ehr_lookups.amount_units (Container);
-CREATE INDEX IX_ehr_lookups_areas_Container ON ehr_lookups.areas (Container);
-CREATE INDEX IX_ehr_lookups_billingtypes_Container ON ehr_lookups.billingtypes (Container);
-CREATE INDEX IX_ehr_lookups_blood_draw_services_Container ON ehr_lookups.blood_draw_services (Container);
-CREATE INDEX IX_ehr_lookups_blood_draw_tube_type_Container ON ehr_lookups.blood_draw_tube_type (Container);
-CREATE INDEX IX_ehr_lookups_blood_tube_volumes_Container ON ehr_lookups.blood_tube_volumes (Container);
-CREATE INDEX IX_ehr_lookups_cage_Container ON ehr_lookups.cage (Container);
-CREATE INDEX IX_ehr_lookups_cage_positions_Container ON ehr_lookups.cage_positions (Container);
-CREATE INDEX IX_ehr_lookups_cage_type_Container ON ehr_lookups.cage_type (Container);
-CREATE INDEX IX_ehr_lookups_cageclass_Container ON ehr_lookups.cageclass (Container);
-CREATE INDEX IX_ehr_lookups_calculated_status_codes_Container ON ehr_lookups.calculated_status_codes (Container);
-CREATE INDEX IX_ehr_lookups_clinpath_status_Container ON ehr_lookups.clinpath_status (Container);
-CREATE INDEX IX_ehr_lookups_clinpath_tests_Container ON ehr_lookups.clinpath_tests (Container);
-CREATE INDEX IX_ehr_lookups_conc_units_Container ON ehr_lookups.conc_units (Container);
-CREATE INDEX IX_ehr_lookups_death_remarks_Container ON ehr_lookups.death_remarks (Container);
-CREATE INDEX IX_ehr_lookups_disallowed_medications_Container ON ehr_lookups.disallowed_medications (Container);
-CREATE INDEX IX_ehr_lookups_divider_types_Container ON ehr_lookups.divider_types (Container);
-CREATE INDEX IX_ehr_lookups_dosage_units_Container ON ehr_lookups.dosage_units (Container);
-CREATE INDEX IX_ehr_lookups_drug_defaults_Container ON ehr_lookups.drug_defaults (Container);
-CREATE INDEX IX_ehr_lookups_flag_categories_Container ON ehr_lookups.flag_categories (Container);
-CREATE INDEX IX_ehr_lookups_full_snomed_Container ON ehr_lookups.full_snomed (Container);
-CREATE INDEX IX_ehr_lookups_gender_codes_Container ON ehr_lookups.gender_codes (Container);
-CREATE INDEX IX_ehr_lookups_lab_test_range_Container ON ehr_lookups.lab_test_range (Container);
-CREATE INDEX IX_ehr_lookups_lab_tests_Container ON ehr_lookups.lab_tests (Container);
-CREATE INDEX IX_ehr_lookups_labwork_panels_Container ON ehr_lookups.labwork_panels (Container);
-CREATE INDEX IX_ehr_lookups_labwork_services_Container ON ehr_lookups.labwork_services (Container);
-CREATE INDEX IX_ehr_lookups_labwork_types_Container ON ehr_lookups.labwork_types (Container);
-CREATE INDEX IX_ehr_lookups_note_types_Container ON ehr_lookups.note_types (Container);
-CREATE INDEX IX_ehr_lookups_parentageTypes_Container ON ehr_lookups.parentageTypes (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_charges_Container ON ehr_lookups.procedure_default_charges (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_codes_Container ON ehr_lookups.procedure_default_codes (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_comments_Container ON ehr_lookups.procedure_default_comments (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_flags_Container ON ehr_lookups.procedure_default_flags (Container);
-CREATE INDEX IX_ehr_lookups_procedure_default_treatments_Container ON ehr_lookups.procedure_default_treatments (Container);
-CREATE INDEX IX_ehr_lookups_procedures_Container ON ehr_lookups.procedures (Container);
-CREATE INDEX IX_ehr_lookups_project_types_Container ON ehr_lookups.project_types (Container);
-CREATE INDEX IX_ehr_lookups_relationshipTypes_Container ON ehr_lookups.relationshipTypes (Container);
-CREATE INDEX IX_ehr_lookups_request_priority_Container ON ehr_lookups.request_priority (Container);
-CREATE INDEX IX_ehr_lookups_restraint_type_Container ON ehr_lookups.restraint_type (Container);
-CREATE INDEX IX_ehr_lookups_routes_Container ON ehr_lookups.routes (Container);
-CREATE INDEX IX_ehr_lookups_snomap_Container ON ehr_lookups.snomap (Container);
-CREATE INDEX IX_ehr_lookups_source_Container ON ehr_lookups.source (Container);
-CREATE INDEX IX_ehr_lookups_species_Container ON ehr_lookups.species (Container);
-CREATE INDEX IX_ehr_lookups_species_codes_Container ON ehr_lookups.species_codes (Container);
-CREATE INDEX IX_ehr_lookups_treatment_frequency_Container ON ehr_lookups.treatment_frequency (Container);
-CREATE INDEX IX_ehr_lookups_treatment_frequency_times_Container ON ehr_lookups.treatment_frequency_times (Container);
-CREATE INDEX IX_ehr_lookups_usda_codes_Container ON ehr_lookups.usda_codes (Container);
-CREATE INDEX IX_ehr_lookups_usda_levels_Container ON ehr_lookups.usda_levels (Container);
-CREATE INDEX IX_ehr_lookups_volume_units_Container ON ehr_lookups.volume_units (Container);
-CREATE INDEX IX_ehr_lookups_weight_ranges_Container ON ehr_lookups.weight_ranges (Container);
-GO
-
--- add new RowId PK column and per-container unique constraints
-ALTER TABLE ehr_lookups.calculated_status_codes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.calculated_status_codes DROP CONSTRAINT PK_calculated_status_codes;
-ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT PK_calculated_status_codes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.calculated_status_codes ADD CONSTRAINT UQ_calculated_status_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.gender_codes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.gender_codes DROP CONSTRAINT PK_gender_codes;
-ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT PK_gender_codes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.gender_codes ADD CONSTRAINT UQ_gender_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.routes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.routes DROP CONSTRAINT PK_routes;
-ALTER TABLE ehr_lookups.routes ADD CONSTRAINT PK_routes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.routes ADD CONSTRAINT UQ_routes UNIQUE (Container,Route);
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.blood_draw_tube_type DROP CONSTRAINT PK_blood_draw_tube_type;
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT PK_blood_draw_tube_type PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.blood_draw_tube_type ADD CONSTRAINT UQ_blood_draw_tube_type UNIQUE (Container,Type);
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.blood_tube_volumes DROP CONSTRAINT PK_blood_tube_volumes;
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT PK_blood_tube_volumes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.blood_tube_volumes ADD CONSTRAINT UQ_blood_tube_volumes UNIQUE (Container,Volume);
-ALTER TABLE ehr_lookups.blood_draw_services ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.blood_draw_services DROP CONSTRAINT PK_blood_draw_services;
-ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT PK_blood_draw_services PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.blood_draw_services ADD CONSTRAINT UQ_blood_draw_services UNIQUE (Container,Service);
-ALTER TABLE ehr_lookups.dosage_units ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.dosage_units DROP CONSTRAINT PK_dosage_units;
-ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT PK_dosage_units PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.dosage_units ADD CONSTRAINT UQ_dosage_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.conc_units ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.conc_units DROP CONSTRAINT PK_conc_units;
-ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT PK_conc_units PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.conc_units ADD CONSTRAINT UQ_conc_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.volume_units ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.volume_units DROP CONSTRAINT PK_volume_units;
-ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT PK_volume_units PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.volume_units ADD CONSTRAINT UQ_volume_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.amount_units ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.amount_units DROP CONSTRAINT PK_amount_units;
-ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT PK_amount_units PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.amount_units ADD CONSTRAINT UQ_amount_units UNIQUE (Container,Unit);
-ALTER TABLE ehr_lookups.flag_categories ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.flag_categories DROP CONSTRAINT PK_flag_categories;
-ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT PK_flag_categories PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.flag_categories ADD CONSTRAINT UQ_flag_categories UNIQUE (Container,Category);
-ALTER TABLE ehr_lookups.weight_ranges ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.weight_ranges DROP CONSTRAINT PK_weight_ranges;
-ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT PK_weight_ranges PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.weight_ranges ADD CONSTRAINT UQ_weight_ranges UNIQUE (Container,Species);
-ALTER TABLE ehr_lookups.species ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.species DROP CONSTRAINT PK_species;
-ALTER TABLE ehr_lookups.species ADD CONSTRAINT PK_species PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.species ADD CONSTRAINT UQ_species UNIQUE (Container,Common);
-ALTER TABLE ehr_lookups.species_codes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.species_codes DROP CONSTRAINT PK_species_codes;
-ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT PK_species_codes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.species_codes ADD CONSTRAINT UQ_species_codes UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.parentageTypes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT PK_parentageTypes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.parentageTypes ADD CONSTRAINT UQ_parentageTypes UNIQUE (Container,Label);
-ALTER TABLE ehr_lookups.labwork_services ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.labwork_services DROP CONSTRAINT PK_labwork_services;
-ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT PK_labwork_services PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.labwork_services ADD CONSTRAINT UQ_labwork_services UNIQUE (Container,ServiceName);
-ALTER TABLE ehr_lookups.source ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.source DROP CONSTRAINT PK_source;
-ALTER TABLE ehr_lookups.source ADD CONSTRAINT PK_source PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.source ADD CONSTRAINT UQ_source UNIQUE (Container,Code);
-ALTER TABLE ehr_lookups.usda_levels ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.usda_levels DROP CONSTRAINT PK_usda_levels;
-ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT PK_usda_levels PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.usda_levels ADD CONSTRAINT UQ_usda_levels UNIQUE (Container,usda_level);
-ALTER TABLE ehr_lookups.areas ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.areas DROP CONSTRAINT PK_areas;
-ALTER TABLE ehr_lookups.areas ADD CONSTRAINT PK_areas PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.areas ADD CONSTRAINT UQ_areas UNIQUE (Container,Area);
-ALTER TABLE ehr_lookups.cage_positions ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.cage_positions DROP CONSTRAINT PK_cage_positions;
-ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT PK_cage_positions PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.cage_positions ADD CONSTRAINT UQ_cage_positions UNIQUE (Container,Cage);
-ALTER TABLE ehr_lookups.clinpath_tests ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.clinpath_tests DROP CONSTRAINT PK_testname;
-ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT PK_clinpath_tests PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.clinpath_tests ADD CONSTRAINT UQ_clinpath_tests UNIQUE (Container,TestName);
-ALTER TABLE ehr_lookups.death_remarks ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.death_remarks DROP CONSTRAINT PK_death_remarks;
-ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT PK_death_remarks PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.death_remarks ADD CONSTRAINT UQ_death_remarks UNIQUE (Container,Title);
-ALTER TABLE ehr_lookups.request_priority ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.request_priority DROP CONSTRAINT PK_request_priority;
-ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT PK_request_priority PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.request_priority ADD CONSTRAINT UQ_request_priority UNIQUE (Container,Priority);
-ALTER TABLE ehr_lookups.restraint_type ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.restraint_type DROP CONSTRAINT PK_restraint_type;
-ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT PK_restraint_type PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.restraint_type ADD CONSTRAINT UQ_restraint_type UNIQUE (Container,Type);
-ALTER TABLE ehr_lookups.labwork_types ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.labwork_types DROP CONSTRAINT PK_labwork_types;
-ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT PK_labwork_types PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.labwork_types ADD CONSTRAINT UQ_labwork_types UNIQUE (Container,Type);
-GO
-
-/* ehr_lookups-18.11-18.12.sql */
-
--- add new RowId PK column and per-container unique constraints
-ALTER TABLE ehr_lookups.treatment_codes ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.treatment_codes DROP CONSTRAINT PK_treatment_codes;
-ALTER TABLE ehr_lookups.treatment_codes ADD CONSTRAINT PK_treatment_codes PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.treatment_codes ADD CONSTRAINT UQ_treatment_codes UNIQUE (Container,Meaning);
-ALTER TABLE ehr_lookups.buildings ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.buildings DROP CONSTRAINT PK_buildings;
-ALTER TABLE ehr_lookups.buildings ADD CONSTRAINT PK_buildings PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.buildings ADD CONSTRAINT UQ_buildings UNIQUE (Container,Name);
-ALTER TABLE ehr_lookups.rooms ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.rooms DROP CONSTRAINT PK_rooms;
-ALTER TABLE ehr_lookups.rooms ADD CONSTRAINT PK_rooms PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.rooms ADD CONSTRAINT UQ_rooms UNIQUE (Container,Room);
-ALTER TABLE ehr_lookups.cage DROP CONSTRAINT PK_cage;
-ALTER TABLE ehr_lookups.cage ADD CONSTRAINT PK_cage PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.cage ADD CONSTRAINT UQ_cage UNIQUE (Container,Location);
-ALTER TABLE ehr_lookups.cage_type ADD RowId INT IDENTITY(1, 1);
-ALTER TABLE ehr_lookups.cage_type DROP CONSTRAINT PK_cage_type;
-ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT PK_cage_type PRIMARY KEY (RowId);
-ALTER TABLE ehr_lookups.cage_type ADD CONSTRAINT UQ_cage_type UNIQUE (Container,CageType);
-GO
\ No newline at end of file
diff --git a/ehr/src/org/labkey/ehr/EHRUpgradeCode.java b/ehr/src/org/labkey/ehr/EHRUpgradeCode.java
index ba633611a..6ff3a7592 100644
--- a/ehr/src/org/labkey/ehr/EHRUpgradeCode.java
+++ b/ehr/src/org/labkey/ehr/EHRUpgradeCode.java
@@ -15,23 +15,14 @@
  */
 package org.labkey.ehr;
 
-import org.labkey.api.data.Container;
-import org.labkey.api.data.ContainerManager;
-import org.labkey.api.data.DbSchema;
-import org.labkey.api.data.PropertyManager;
-import org.labkey.api.data.SqlExecutor;
 import org.labkey.api.data.Table;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.UpgradeCode;
-import org.labkey.api.module.Module;
 import org.labkey.api.module.ModuleContext;
-import org.labkey.api.module.ModuleLoader;
 
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class EHRUpgradeCode implements UpgradeCode
@@ -70,103 +61,4 @@ public void populateCalendar(final ModuleContext moduleContext)
             Table.insert(null, calendar, row);
         }
     }
-
-    private void setContainerColumn(ModuleContext moduleContext, List<String> tableNames, DbSchema schema)
-    {
-        if (moduleContext.isNewInstall())
-            return;
-
-        Module module = ModuleLoader.getInstance().getModule(moduleContext.getName());
-        String category = "moduleProperties." + module.getName();
-        String ehrStudyContainerPath = PropertyManager.getCoalescedProperty(PropertyManager.SHARED_USER, ContainerManager.getRoot(), category, EHRManager.EHRStudyContainerPropName);
-
-        if (ehrStudyContainerPath != null)
-        {
-            Container ehrStudyContainer = ContainerManager.getForPath(ehrStudyContainerPath);
-            for (String tableName : tableNames)
-            {
-                TableInfo table = schema.getTable(tableName);
-                new SqlExecutor(schema).execute("UPDATE " + table + " SET Container = ? WHERE Container IS NULL", ehrStudyContainer);
-            }
-        }
-    }
-
-    /**
-     * called at ehr_lookups-18.10-18.20. safe to remove in 20.11, once 18.20 is the earliest upgrade version.
-     */
-    @SuppressWarnings({"UnusedDeclaration"})
-    public void setEhrLookupsContainerSecondSet(final ModuleContext moduleContext)
-    {
-        List<String> ehrLookupsTableNames = Arrays.asList(
-                        "ageclass",
-                        "amount_units",
-                        "areas",
-                        "billingtypes",
-                        "blood_draw_services",
-                        "blood_draw_tube_type",
-                        "blood_tube_volumes",
-                        "cage",
-                        "cage_positions",
-                        "cage_type",
-                        "cageclass",
-                        "calculated_status_codes",
-                        "clinpath_status",
-                        "clinpath_tests",
-                        "conc_units",
-                        "death_remarks",
-                        "disallowed_medications",
-                        "divider_types",
-                        "dosage_units",
-                        "drug_defaults",
-                        "flag_categories",
-                        "full_snomed",
-                        "gender_codes",
-                        "lab_test_range",
-                        "lab_tests",
-                        "labwork_panels",
-                        "labwork_services",
-                        "labwork_types",
-                        "note_types",
-                        "parentageTypes",
-                        "procedure_default_charges",
-                        "procedure_default_codes",
-                        "procedure_default_comments",
-                        "procedure_default_flags",
-                        "procedure_default_treatments",
-                        "procedures",
-                        "project_types",
-                        "relationshipTypes",
-                        "request_priority",
-                        "restraint_type",
-                        "routes",
-                        "snomap",
-                        "source",
-                        "species",
-                        "species_codes",
-                        "treatment_frequency",
-                        "treatment_frequency_times",
-                        "usda_codes",
-                        "usda_levels",
-                        "volume_units",
-                        "weight_ranges"
-                );
-
-                DbSchema ehrLookupsSchema = EHRSchema.getInstance().getEHRLookupsSchema();
-                setContainerColumn(moduleContext, ehrLookupsTableNames, ehrLookupsSchema);
-    }
-
-    /**
-     * called at ehr_lookups-18.10-18.20. safe to remove in 20.11, once 18.20 is the earliest upgrade version.
-     */
-    @SuppressWarnings({"UnusedDeclaration"})
-    public void setEhrContainerFirstSet(final ModuleContext moduleContext)
-    {
-        List<String> ehrTableNames = Arrays.asList(
-                "protocolProcedures",
-                "scheduled_task_types"
-        );
-
-        DbSchema ehrSchema = EHRSchema.getInstance().getSchema();
-        setContainerColumn(moduleContext, ehrTableNames, ehrSchema);
-    }
 }
\ No newline at end of file