From 6b833e1af1892d04d0301a1171ca1c52f1093f85 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 30 Apr 2026 16:38:53 -0700 Subject: [PATCH] Drop redundant indices --- .../postgresql/ehr_lookups-26.002-26.003.sql | 60 +++++++++++++++++++ ehr/src/org/labkey/ehr/EHRModule.java | 2 +- .../postgresql/ehr_billing-26.000-26.001.sql | 6 ++ .../labkey/ehr_billing/EHR_BillingModule.java | 2 +- .../postgresql/snd-26.000-26.001.sql | 6 ++ snd/src/org/labkey/snd/SNDModule.java | 2 +- 6 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql create mode 100644 ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql create mode 100644 snd/resources/schemas/dbscripts/postgresql/snd-26.000-26.001.sql diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql new file mode 100644 index 000000000..5368f65ed --- /dev/null +++ b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-26.002-26.003.sql @@ -0,0 +1,60 @@ +-- Dropping ix_ehr_lookups_request_priority_container [container] because it overlaps with uq_request_priority [container, priority] +DROP INDEX ehr_lookups.ix_ehr_lookups_request_priority_container; +-- Dropping ix_ehr_lookups_usda_levels_container [container] because it overlaps with uq_usda_levels [container, usda_level] +DROP INDEX ehr_lookups.ix_ehr_lookups_usda_levels_container; +-- Dropping ix_rooms_container [container] because it overlaps with uq_rooms [container, room] +DROP INDEX ehr_lookups.ix_rooms_container; +-- Dropping ix_ehr_lookups_cage_positions_container [container] because it overlaps with uq_cage_positions [container, cage] +DROP INDEX ehr_lookups.ix_ehr_lookups_cage_positions_container; +-- Dropping ix_ehr_lookups_blood_tube_volumes_container [container] because it overlaps with uq_blood_tube_volumes [container, volume] +DROP INDEX ehr_lookups.ix_ehr_lookups_blood_tube_volumes_container; +-- Dropping ix_ehr_lookups_areas_container [container] because it overlaps with uq_areas [container, area] +DROP INDEX ehr_lookups.ix_ehr_lookups_areas_container; +-- Dropping ix_ehr_lookups_source_container [container] because it overlaps with uq_source [container, code] +DROP INDEX ehr_lookups.ix_ehr_lookups_source_container; +-- Dropping ix_ehr_lookups_flag_categories_container [container] because it overlaps with uq_flag_categories [container, category] +DROP INDEX ehr_lookups.ix_ehr_lookups_flag_categories_container; +-- Dropping ix_ehr_lookups_routes_container [container] because it overlaps with uq_routes [container, route] +DROP INDEX ehr_lookups.ix_ehr_lookups_routes_container; +-- Dropping ix_ehr_lookups_cage_container [container] because it overlaps with uq_cage [container, location] +DROP INDEX ehr_lookups.ix_ehr_lookups_cage_container; +-- Dropping ix_ehr_lookups_blood_draw_services_container [container] because it overlaps with uq_blood_draw_services [container, service] +DROP INDEX ehr_lookups.ix_ehr_lookups_blood_draw_services_container; +-- Dropping ix_ehr_lookups_clinpath_tests_container [container] because it overlaps with uq_clinpath_tests [container, testname] +DROP INDEX ehr_lookups.ix_ehr_lookups_clinpath_tests_container; +-- Dropping ix_ehr_lookups_species_codes_container [container] because it overlaps with uq_species_codes [container, code] +DROP INDEX ehr_lookups.ix_ehr_lookups_species_codes_container; +-- Dropping ix_ehr_lookups_labwork_types_container [container] because it overlaps with uq_labwork_types [container, type] +DROP INDEX ehr_lookups.ix_ehr_lookups_labwork_types_container; +-- Dropping ix_ehr_lookups_death_remarks_container [container] because it overlaps with uq_death_remarks [container, title] +DROP INDEX ehr_lookups.ix_ehr_lookups_death_remarks_container; +-- Dropping ix_ehr_lookups_gender_codes_container [container] because it overlaps with uq_gender_codes [container, code] +DROP INDEX ehr_lookups.ix_ehr_lookups_gender_codes_container; +-- Dropping ix_buildings_container [container] because it overlaps with uq_buildings [container, name] +DROP INDEX ehr_lookups.ix_buildings_container; +-- Dropping ix_ehr_lookups_restraint_type_container [container] because it overlaps with uq_restraint_type [container, type] +DROP INDEX ehr_lookups.ix_ehr_lookups_restraint_type_container; +-- Dropping ix_ehr_lookups_conc_units_container [container] because it overlaps with uq_conc_units [container, unit] +DROP INDEX ehr_lookups.ix_ehr_lookups_conc_units_container; +-- Dropping ix_ehr_lookups_weight_ranges_container [container] because it overlaps with uq_weight_ranges [container, species] +DROP INDEX ehr_lookups.ix_ehr_lookups_weight_ranges_container; +-- Dropping ix_ehr_lookups_dosage_units_container [container] because it overlaps with uq_dosage_units [container, unit] +DROP INDEX ehr_lookups.ix_ehr_lookups_dosage_units_container; +-- Dropping ix_ehr_lookups_volume_units_container [container] because it overlaps with uq_volume_units [container, unit] +DROP INDEX ehr_lookups.ix_ehr_lookups_volume_units_container; +-- Dropping ix_ehr_lookups_blood_draw_tube_type_container [container] because it overlaps with uq_blood_draw_tube_type [container, type] +DROP INDEX ehr_lookups.ix_ehr_lookups_blood_draw_tube_type_container; +-- Dropping ix_ehr_lookups_cage_type_container [container] because it overlaps with uq_cage_type [container, cagetype] +DROP INDEX ehr_lookups.ix_ehr_lookups_cage_type_container; +-- Dropping ix_ehr_lookups_amount_units_container [container] because it overlaps with uq_amount_units [container, unit] +DROP INDEX ehr_lookups.ix_ehr_lookups_amount_units_container; +-- Dropping ix_treatment_codes_container [container] because it overlaps with uq_treatment_codes [container, meaning] +DROP INDEX ehr_lookups.ix_treatment_codes_container; +-- Dropping ix_ehr_lookups_calculated_status_codes_container [container] because it overlaps with uq_calculated_status_codes [container, code] +DROP INDEX ehr_lookups.ix_ehr_lookups_calculated_status_codes_container; +-- Dropping ix_ehr_lookups_species_container [container] because it overlaps with uq_species [container, common] +DROP INDEX ehr_lookups.ix_ehr_lookups_species_container; +-- Dropping ix_ehr_lookups_labwork_services_container [container] because it overlaps with uq_labwork_services [container, servicename] +DROP INDEX ehr_lookups.ix_ehr_lookups_labwork_services_container; +-- Dropping ix_ehr_lookups_parentagetypes_container [container] because it overlaps with uq_parentagetypes [container, label] +DROP INDEX ehr_lookups.ix_ehr_lookups_parentagetypes_container; diff --git a/ehr/src/org/labkey/ehr/EHRModule.java b/ehr/src/org/labkey/ehr/EHRModule.java index acb836e9e..b3b66f0df 100644 --- a/ehr/src/org/labkey/ehr/EHRModule.java +++ b/ehr/src/org/labkey/ehr/EHRModule.java @@ -135,7 +135,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 26.002; + return 26.003; } @Override diff --git a/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql new file mode 100644 index 000000000..21c37d565 --- /dev/null +++ b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-26.000-26.001.sql @@ -0,0 +1,6 @@ +-- Dropping unique_invoice_num [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber] +ALTER TABLE ehr_billing.invoice DROP CONSTRAINT unique_invoice_num; +-- Dropping ix_ehr_billing_invoice_invoicenumber [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber] +DROP INDEX ehr_billing.ix_ehr_billing_invoice_invoicenumber; +-- Dropping uq_ehr_billing_invoice_invoicenumber [invoiceNumber] because it overlaps with pk_ehr_billing_invoice_invnum [invoiceNumber] +ALTER TABLE ehr_billing.invoice DROP CONSTRAINT uq_ehr_billing_invoice_invoicenumber; diff --git a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java index 2599c5c76..f1c2d6f35 100644 --- a/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java +++ b/ehr_billing/src/org/labkey/ehr_billing/EHR_BillingModule.java @@ -63,7 +63,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 26.000; + return 26.001; } @Override diff --git a/snd/resources/schemas/dbscripts/postgresql/snd-26.000-26.001.sql b/snd/resources/schemas/dbscripts/postgresql/snd-26.000-26.001.sql new file mode 100644 index 000000000..de60be5a7 --- /dev/null +++ b/snd/resources/schemas/dbscripts/postgresql/snd-26.000-26.001.sql @@ -0,0 +1,6 @@ +-- Dropping idx_snd_lookups_lookupsetid [LookupSetId] because it overlaps with idx_snd_lookups_lookupsetid_value [LookupSetId, Value] +DROP INDEX snd.idx_snd_lookups_lookupsetid; +-- Dropping idx_snd_pkgcategoryjunction_pkgid [PkgId] because it overlaps with pk_snd_pkgcategoryjunction [PkgId, CategoryId] +DROP INDEX snd.idx_snd_pkgcategoryjunction_pkgid; +-- Dropping idx_snd_eventnotes_eventnoteid [EventNoteId] because it overlaps with pk_snd_eventnotes [EventNoteId] +DROP INDEX snd.idx_snd_eventnotes_eventnoteid; diff --git a/snd/src/org/labkey/snd/SNDModule.java b/snd/src/org/labkey/snd/SNDModule.java index 6497d9c73..3a1325e88 100644 --- a/snd/src/org/labkey/snd/SNDModule.java +++ b/snd/src/org/labkey/snd/SNDModule.java @@ -67,7 +67,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 26.000; + return 26.001; } @Override