diff --git a/OConnor/module.properties b/OConnor/module.properties index 4197cc65..76c8ffa2 100644 --- a/OConnor/module.properties +++ b/OConnor/module.properties @@ -1,4 +1,4 @@ Name: OConnor -SchemaVersion: 26.001 +SchemaVersion: 26.002 RequiredServerVersion: 16.30 ManageVersion: true diff --git a/OConnor/resources/schemas/dbscripts/postgresql/oconnor-26.001-26.002.sql b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-26.001-26.002.sql new file mode 100644 index 00000000..78918a2f --- /dev/null +++ b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-26.001-26.002.sql @@ -0,0 +1,7 @@ +-- Dropping key [key] because it overlaps with inventorytemp_pkey [key] +DROP INDEX oconnor.key; +-- Dropping experiment_db_experiment_number_key [experiment_number] because it overlaps with pk_experiment_db [experiment_number] +DROP INDEX oconnor.experiment_db_experiment_number_key; +-- Dropping unique index because pk_experiment_db [experiment_number] overlaps it with a smaller column set. Not bothering +-- to convert this unique index to a non-unique index because it has 11 columns, which is absurd. +DROP INDEX oconnor.experiment_db_experiment_number_created_createdby_description_t; diff --git a/genotyping/resources/schemas/dbscripts/postgresql/genotyping-26.000-26.001.sql b/genotyping/resources/schemas/dbscripts/postgresql/genotyping-26.000-26.001.sql new file mode 100644 index 00000000..d7ab45bf --- /dev/null +++ b/genotyping/resources/schemas/dbscripts/postgresql/genotyping-26.000-26.001.sql @@ -0,0 +1,7 @@ +-- Dropping idx_animalanalysis_animal [AnimalId] because it overlaps with uq_animalanalysis [AnimalId, RunId] +DROP INDEX genotyping.idx_animalanalysis_animal; +-- Dropping idx_animal_container [Container] because it overlaps with uq_animal_labanimalid [Container, LabAnimalId] +DROP INDEX genotyping.idx_animal_container; +-- Converting unique_runs [RowId, Container, MetaDataId] from unique to non-unique index because pk_runs [RowId] overlaps it with a smaller column set +ALTER TABLE genotyping.Runs DROP CONSTRAINT unique_runs; +CREATE INDEX index_runs ON genotyping.Runs(RowId, Container, MetaDataId); diff --git a/genotyping/src/org/labkey/genotyping/GenotypingModule.java b/genotyping/src/org/labkey/genotyping/GenotypingModule.java index b33d48d0..e77f68b3 100644 --- a/genotyping/src/org/labkey/genotyping/GenotypingModule.java +++ b/genotyping/src/org/labkey/genotyping/GenotypingModule.java @@ -51,7 +51,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 26.000; + return 26.001; } @Override