Merge 25.11 to 26.3

labkey-teamcity · labkey-teamcity · commit 1632bf88132d · 2026-05-11T01:02:34.000Z
diff --git a/wnprc_billing/resources/schemas/dbscripts/postgresql/wnprc_billing-22.000-22.001.sql b/wnprc_billing/resources/schemas/dbscripts/postgresql/wnprc_billing-22.000-22.001.sql
@@ -0,0 +1,2 @@
+-- Dropping idx_wnprc_billing_groupcategoryassociations_chargegroupname [chargeGroupName] because it overlaps with uq_wnprc_billing_groupcategoryassociations_group_category [chargeGroupName, chargeCategoryId]
+DROP INDEX wnprc_billing.idx_wnprc_billing_groupcategoryassociations_chargegroupname;
diff --git a/wnprc_billing/src/org/labkey/wnprc_billing/WNPRC_BillingModule.java b/wnprc_billing/src/org/labkey/wnprc_billing/WNPRC_BillingModule.java
@@ -65,7 +65,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 22.000;
+        return 22.001;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- Dropping idx_wnprc_billing_groupcategoryassociations_chargegroupname [chargeGroupName] because it overlaps with uq_wnprc_billing_groupcategoryassociations_group_category [chargeGroupName, chargeCategoryId]`
	`2`	`+DROP INDEX wnprc_billing.idx_wnprc_billing_groupcategoryassociations_chargegroupname;`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public String getName()`
`65`	`65`	`@Override`
`66`	`66`	`public @Nullable Double getSchemaVersion()`
`67`	`67`	`{`
`68`		`- return 22.000;`
	`68`	`+ return 22.001;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`