From 95063dc7e2505e464b6c270160630b5aad48c6ac Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 30 Apr 2026 16:38:51 -0700 Subject: [PATCH 1/2] Drop redundant indices --- .../dbscripts/postgresql/targetedms-26.004-26.005.sql | 10 ++++++++++ src/org/labkey/targetedms/TargetedMSModule.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 resources/schemas/dbscripts/postgresql/targetedms-26.004-26.005.sql diff --git a/resources/schemas/dbscripts/postgresql/targetedms-26.004-26.005.sql b/resources/schemas/dbscripts/postgresql/targetedms-26.004-26.005.sql new file mode 100644 index 000000000..14e1c1165 --- /dev/null +++ b/resources/schemas/dbscripts/postgresql/targetedms-26.004-26.005.sql @@ -0,0 +1,10 @@ +-- Dropping idx_instrumentusagepayment_instrumentscheduleid [instrumentScheduleId] because it overlaps with pk_instrumentusagepayment [instrumentScheduleId, paymentMethod] +DROP INDEX targetedms.idx_instrumentusagepayment_instrumentscheduleid; +-- Dropping ix_qcannotationtype_container [Container] because it overlaps with uq_qcannotationtype_containername [Container, Name] +DROP INDEX targetedms.ix_qcannotationtype_container; +-- Dropping ix_precursor_id [Id] because it overlaps with pk_precursor_id [Id] +DROP INDEX targetedms.ix_precursor_id; +-- Dropping ix_qcmetricexclusion_replicateid [ReplicateId] because it overlaps with uq_qcmetricexclusion_replicate_metric [ReplicateId, MetricId] +DROP INDEX targetedms.ix_qcmetricexclusion_replicateid; +-- Dropping ix_irtpeptide_irtscaleid [iRTScaleId] because it overlaps with uq_irtpeptide_sequenceandscale [iRTScaleId, ModifiedSequence] +DROP INDEX targetedms.ix_irtpeptide_irtscaleid; diff --git a/src/org/labkey/targetedms/TargetedMSModule.java b/src/org/labkey/targetedms/TargetedMSModule.java index df82dd64e..97dafcea8 100644 --- a/src/org/labkey/targetedms/TargetedMSModule.java +++ b/src/org/labkey/targetedms/TargetedMSModule.java @@ -231,7 +231,7 @@ public String getName() @Override public Double getSchemaVersion() { - return 26.004; + return 26.005; } @Override From 50d9401402a7796dfafe0f27315450f1515fe370 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Thu, 30 Apr 2026 21:32:02 -0700 Subject: [PATCH 2/2] Drop another redundant index --- .../schemas/dbscripts/postgresql/targetedms-26.005-26.006.sql | 4 ++++ src/org/labkey/targetedms/TargetedMSModule.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 resources/schemas/dbscripts/postgresql/targetedms-26.005-26.006.sql diff --git a/resources/schemas/dbscripts/postgresql/targetedms-26.005-26.006.sql b/resources/schemas/dbscripts/postgresql/targetedms-26.005-26.006.sql new file mode 100644 index 000000000..9327670a0 --- /dev/null +++ b/resources/schemas/dbscripts/postgresql/targetedms-26.005-26.006.sql @@ -0,0 +1,4 @@ +-- When reparenting the QCEmailNotifications table from PanoramaPremium schema to targetedms, an attempt was made to +-- drop this index, but the attempt failed because it targeted the old schema. This index is redundant with +-- IX_qcEmailNotifications_Container. +DROP INDEX IF EXISTS targetedms.IX_PanoramaPremium_qcEmailNotifications_Container; diff --git a/src/org/labkey/targetedms/TargetedMSModule.java b/src/org/labkey/targetedms/TargetedMSModule.java index 97dafcea8..581f67f52 100644 --- a/src/org/labkey/targetedms/TargetedMSModule.java +++ b/src/org/labkey/targetedms/TargetedMSModule.java @@ -231,7 +231,7 @@ public String getName() @Override public Double getSchemaVersion() { - return 26.005; + return 26.006; } @Override