Skip to content

Use tableName instead of tableInfo for dataclass upgrade scripts #7455

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
XingY merged 1 commit into from
Feb 25, 2026
Merged

Use tableName instead of tableInfo for dataclass upgrade scripts #7455

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
6 changes: 3 additions & 3 deletions experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,17 +622,17 @@ private static void upgradeProvisionedDataClassTable(ExpDataClassImpl dc)
SqlExecutor executor = new SqlExecutor(scope);
boolean isPostgreSQL = scope.getSqlDialect().isPostgreSQL();
if (isPostgreSQL)
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(provisionedTable).append(" ALTER COLUMN rowId SET NOT NULL"));
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(domain.getStorageTableName()).append(" ALTER COLUMN rowId SET NOT NULL"));
else
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(provisionedTable).append(" ALTER COLUMN rowId INT NOT NULL"));
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(domain.getStorageTableName()).append(" ALTER COLUMN rowId INT NOT NULL"));

// Add indexes back via StorageProvisioner
storageProvisioner.ensureTableIndices(domain);
LOG.info("DataClass '{}' ({}) added unique index on 'rowId'", dc.getName(), dc.getRowId());

// Add FK constraint (no StorageProvisioner API for FKs on existing tables)
String fkName = "fk_rowid_" + domain.getStorageTableName() + "_data";
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(provisionedTable)
executor.execute(new SQLFragment("ALTER TABLE expdataclass.").append(domain.getStorageTableName())
.append(" ADD CONSTRAINT ").append(fkName)
.append(" FOREIGN KEY (rowId) REFERENCES exp.Data(RowId)"));
LOG.info("DataClass '{}' ({}) added FK constraint on 'rowId'", dc.getName(), dc.getRowId());
Expand Down