Skip to content

Remove SQL Server upgrade scripts and code #7969

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

Open
labkey-jeckels wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Remove SQL Server upgrade scripts and code #7969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5d8023
Remove SQL Server upgrade scripts and code
labkey-jeckels Aug 21, 2026
8e5976d
Another simplification
labkey-jeckels Aug 22, 2026
61cac89
Additional cleanup
labkey-jeckels Aug 22, 2026
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
1 change: 0 additions & 1 deletion announcements/module.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ Organization: LabKey
OrganizationURL: https://www.labkey.com/
License: Apache 2.0
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
SupportedDatabases: mssql, pgsql
ManageVersion: true
164 changes: 0 additions & 164 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-0.000-24.000.sql
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-25.000-25.001.sql
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-25.001-25.002.sql
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-25.002-25.003.sql
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-create.sql
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions announcements/resources/schemas/dbscripts/sqlserver/comm-drop.sql
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion api/module.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ Organization: LabKey
OrganizationURL: https://www.labkey.com/
License: Apache 2.0
LicenseURL: http://www.apache.org/licenses/LICENSE-2.0
SupportedDatabases: mssql, pgsql
ManageVersion: true
5 changes: 0 additions & 5 deletions api/src/org/labkey/api/assay/AbstractAssayProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,11 +1807,6 @@ protected boolean hasFilterCriteria(ExpProtocol protocol, Domain resultsDomain)
return false;
}

@Override
public void removeFilterCriteriaForProperty(PropertyDescriptor pd)
{
}

public record AssayFileMoveData(ExpRun run, Container sourceContainer, String fieldName, File sourceFile, File targetFile) {}

public record AssayMoveData(Map<String, Integer> counts, Map<Long, List<AssayFileMoveData>> fileMovesByRunId) {}
Expand Down
2 changes: 0 additions & 2 deletions api/src/org/labkey/api/assay/AssayProvider.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.api.exp.Handler;
import org.labkey.api.exp.Lsid;
import org.labkey.api.exp.ObjectProperty;
import org.labkey.api.exp.PropertyDescriptor;
import org.labkey.api.exp.XarContext;
import org.labkey.api.exp.api.ExpData;
import org.labkey.api.exp.api.ExpExperiment;
Expand Down Expand Up @@ -274,7 +273,6 @@ enum Scope

@NotNull List<FilterCriteria> getFilterCriteria(ExpProtocol protocol);
boolean hasFilterCriteria(ExpProtocol protocol);
void removeFilterCriteriaForProperty(PropertyDescriptor pd);

/**
* @return the data type that this run creates for its analyzed results
Expand Down
18 changes: 3 additions & 15 deletions api/src/org/labkey/api/data/DbSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,21 +622,9 @@ public void testDDLMethods() throws Exception

SqlExecutor executor = new SqlExecutor(testSchema);

if (testSchema.getSqlDialect().isSqlServer())
{
// test the 3 ways to create a schema on SQLServer
executor.execute("EXEC sp_addapprole 'testdrop', 'password'");
executor.execute("CREATE SCHEMA testdrop2");
executor.execute(testSchema.getSqlDialect().getCreateSchemaSql("testdrop3"));
}
else if (testSchema.getSqlDialect().isPostgreSQL())
{
executor.execute("CREATE SCHEMA testdrop");
executor.execute("CREATE SCHEMA testdrop2");
executor.execute("CREATE SCHEMA testdrop3");
}
else
return;
executor.execute("CREATE SCHEMA testdrop");
executor.execute("CREATE SCHEMA testdrop2");
executor.execute("CREATE SCHEMA testdrop3");

executor.execute("CREATE TABLE testdrop.T0 (c0 INT NOT NULL PRIMARY KEY)");
executor.execute("CREATE TABLE testdrop.T (c1 CHAR(1), fk_c0 INT REFERENCES testdrop.T0(c0))");
Expand Down
Loading