Skip to content

Remove SQL Server upgrade scripts and code #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Aug 23, 2026
+3 −5
Merged

Remove SQL Server upgrade scripts and code #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/labkey/targetedms/query/SkylineAuditTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 1 addition & 2 deletions test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";
Expand Down
3 changes: 1 addition & 2 deletions test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading