From 61fa1ca5c65e16c08b9badae8c900c5bf937e496 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 21 Aug 2026 16:34:32 -0700 Subject: [PATCH] Remove SQL Server upgrade scripts and code --- src/org/labkey/targetedms/query/SkylineAuditTable.java | 2 +- .../labkey/test/tests/targetedms/InstrumentSchedulingTest.java | 3 +-- .../labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/targetedms/query/SkylineAuditTable.java b/src/org/labkey/targetedms/query/SkylineAuditTable.java index d50e4f373..f538f4703 100644 --- a/src/org/labkey/targetedms/query/SkylineAuditTable.java +++ b/src/org/labkey/targetedms/query/SkylineAuditTable.java @@ -107,7 +107,7 @@ public SkylineAuditTable(@NotNull String name, @NotNull TargetedMSSchema schema, cteSQL.add(_run.getDocumentGUID()); SQLFragment result = new SQLFragment(); - result.addCommonTableExpression(getSqlDialect(), "TargetedMSAuditCTE", "logTree", cteSQL, getSqlDialect().isPostgreSQL()); + result.addCommonTableExpression(getSqlDialect(), "TargetedMSAuditCTE", "logTree", cteSQL, true); result.append("SELECT lt.* \n"); result.append(", CASE WHEN msg.orderNumber = 0 AND lt.extraInfo IS NOT NULL THEN '(info)' END AS HasExtraInfo\n"); diff --git a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java index ea9905ba9..5693f42d8 100644 --- a/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java +++ b/test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java @@ -31,7 +31,6 @@ import org.labkey.test.util.ApiPermissionsHelper; import org.labkey.test.util.PermissionsHelper; import org.labkey.test.util.PortalHelper; -import org.labkey.test.util.PostgresOnlyTest; import org.openqa.selenium.WebElement; import java.io.IOException; @@ -53,7 +52,7 @@ */ @Category({}) @FixMethodOrder(MethodSorters.NAME_ASCENDING) // Don't insert additional projects until after testSchedule() has run -public class InstrumentSchedulingTest extends TargetedMSTest implements PostgresOnlyTest +public class InstrumentSchedulingTest extends TargetedMSTest { public static final String INSTRUMENT_1 = "Instrument1"; public static final String INSTRUMENT_2 = "Instrument2"; diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java index d103fc1f7..6a0c4f6e4 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java @@ -106,8 +106,7 @@ public void preTest() @Override protected void doCleanup(boolean afterTest) throws TestTimeoutException { - // Use the API-based approach for deletion so that we don't trigger AJAX requests navigating to the delete page - // that may run in the background and cause SQL Server deadlock exceptions + // Use the API-based approach for deletion so that we don't trigger AJAX requests by navigating to the delete page new APIContainerHelper(this).deleteProject(getProjectName(), afterTest); }