From 5cc7b6bddfe4125a0e1bac53f126cdf516ee9749 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 25 Feb 2026 10:01:14 -0800 Subject: [PATCH] Use tableName instead of tableInfo for dataclass upgrade scripts --- .../src/org/labkey/experiment/ExperimentUpgradeCode.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java b/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java index 40ab7ee9a62..2f6a3a274b1 100644 --- a/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java +++ b/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java @@ -622,9 +622,9 @@ 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); @@ -632,7 +632,7 @@ private static void upgradeProvisionedDataClassTable(ExpDataClassImpl dc) // 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());