From df1c733c72b611a9c4dcc43ba8518bb74fb3c97b Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 30 Jun 2026 21:36:05 -0700 Subject: [PATCH 1/8] GitHub Issue 1117: sample type and dataclass foreign keys --- experiment/src/org/labkey/experiment/XarReader.java | 5 +++++ .../src/org/labkey/experiment/api/SampleTypeServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index 31791c10306..599fdec5394 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -97,6 +97,7 @@ import org.labkey.api.exp.api.ExperimentService; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; +import org.labkey.api.exp.property.DomainKind; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.exp.property.PropertyService; import org.labkey.api.exp.query.ExpMaterialTable; @@ -893,6 +894,10 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { + DomainKind kind = domain.getDomainKind(); + if (kind != null) + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 + domain.save(getUser()); DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues); } diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index 9ba38e5d89b..f69d0948abe 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -835,7 +835,11 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo); DomainKind kind = domain.getDomainKind(); if (kind != null) + { domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117 + } + Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); Set lowerReservedNames = reservedNames.stream().map(String::toLowerCase).collect(Collectors.toSet()); From 238671b10932b8a17685b58c35d1bcdf5d19c602 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 1 Jul 2026 10:09:33 -0700 Subject: [PATCH 2/8] CC code review --- experiment/src/org/labkey/experiment/XarReader.java | 5 ----- .../src/org/labkey/experiment/api/ExperimentServiceImpl.java | 2 -- .../src/org/labkey/experiment/api/SampleTypeServiceImpl.java | 3 --- .../experiment/api/property/StorageProvisionerImpl.java | 5 ++++- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index 599fdec5394..31791c10306 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -97,7 +97,6 @@ import org.labkey.api.exp.api.ExperimentService; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; -import org.labkey.api.exp.property.DomainKind; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.exp.property.PropertyService; import org.labkey.api.exp.query.ExpMaterialTable; @@ -894,10 +893,6 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { - DomainKind kind = domain.getDomainKind(); - if (kind != null) - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 - domain.save(getUser()); DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues); } diff --git a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java index 46490f7c156..29ac035884b 100644 --- a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java @@ -8074,8 +8074,6 @@ else if (domain.getPropertyByName(propertyName) != null) // issue 25275 { OntologyManager.ensureObject(c, lsid.toString()); - if (kind != null) - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); domain.save(u, options == null ? null : options.getAuditRecordMap(), calculatedFields); impl.save(u); diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index f69d0948abe..241fa13a42b 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -835,10 +835,7 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo); DomainKind kind = domain.getDomainKind(); if (kind != null) - { domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117 - } Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); diff --git a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java index 3b13e69f3ff..56e7d5f3c26 100644 --- a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java +++ b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java @@ -213,7 +213,10 @@ private String _create(DbScope scope, DomainKind kind, Domain domain, boolean indices.addAll(domain.getPropertyIndices()); change.setIndexedColumns(domain, indices); - change.setForeignKeys(domain.getPropertyForeignKeys()); + // GitHub Issue 1117 + Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer())); + foreignKeys.addAll(domain.getPropertyForeignKeys()); + change.setForeignKeys(foreignKeys); try { From b3587cd6ef787a52b4a48784ad2cbfa84b93adb8 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 1 Jul 2026 10:37:17 -0700 Subject: [PATCH 3/8] Revert "CC code review" This reverts commit 238671b10932b8a17685b58c35d1bcdf5d19c602. --- experiment/src/org/labkey/experiment/XarReader.java | 5 +++++ .../src/org/labkey/experiment/api/ExperimentServiceImpl.java | 2 ++ .../src/org/labkey/experiment/api/SampleTypeServiceImpl.java | 3 +++ .../experiment/api/property/StorageProvisionerImpl.java | 5 +---- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index 31791c10306..599fdec5394 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -97,6 +97,7 @@ import org.labkey.api.exp.api.ExperimentService; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; +import org.labkey.api.exp.property.DomainKind; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.exp.property.PropertyService; import org.labkey.api.exp.query.ExpMaterialTable; @@ -893,6 +894,10 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { + DomainKind kind = domain.getDomainKind(); + if (kind != null) + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 + domain.save(getUser()); DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues); } diff --git a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java index 29ac035884b..46490f7c156 100644 --- a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java @@ -8074,6 +8074,8 @@ else if (domain.getPropertyByName(propertyName) != null) // issue 25275 { OntologyManager.ensureObject(c, lsid.toString()); + if (kind != null) + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); domain.save(u, options == null ? null : options.getAuditRecordMap(), calculatedFields); impl.save(u); diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index 241fa13a42b..f69d0948abe 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -835,7 +835,10 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo); DomainKind kind = domain.getDomainKind(); if (kind != null) + { domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117 + } Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); diff --git a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java index 56e7d5f3c26..3b13e69f3ff 100644 --- a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java +++ b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java @@ -213,10 +213,7 @@ private String _create(DbScope scope, DomainKind kind, Domain domain, boolean indices.addAll(domain.getPropertyIndices()); change.setIndexedColumns(domain, indices); - // GitHub Issue 1117 - Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer())); - foreignKeys.addAll(domain.getPropertyForeignKeys()); - change.setForeignKeys(foreignKeys); + change.setForeignKeys(domain.getPropertyForeignKeys()); try { From 87320c9d9b3fbd945a30636f49e9ed929ffa04ec Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 1 Jul 2026 10:41:51 -0700 Subject: [PATCH 4/8] Scope changes to samples and dataclass --- experiment/src/org/labkey/experiment/XarReader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index 599fdec5394..c748a075e28 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -95,6 +95,7 @@ import org.labkey.api.exp.api.ExpRun; import org.labkey.api.exp.api.ExpSampleType; import org.labkey.api.exp.api.ExperimentService; +import org.labkey.api.exp.api.SampleTypeDomainKind; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; import org.labkey.api.exp.property.DomainKind; @@ -122,6 +123,7 @@ import org.labkey.experiment.api.AliasInsertHelper; import org.labkey.experiment.api.Data; import org.labkey.experiment.api.DataClass; +import org.labkey.experiment.api.DataClassDomainKind; import org.labkey.experiment.api.DataInput; import org.labkey.experiment.api.ExpDataClassImpl; import org.labkey.experiment.api.ExpDataImpl; @@ -895,7 +897,7 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { DomainKind kind = domain.getDomainKind(); - if (kind != null) + if (kind instanceof SampleTypeDomainKind || kind instanceof DataClassDomainKind) domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 domain.save(getUser()); From 4dd496349e2447ea7a5d4b43318acb03ca382507 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 2 Jul 2026 12:51:39 -0700 Subject: [PATCH 5/8] Make change generic, remove unused assay FK --- .../org/labkey/api/assay/AssayResultDomainKind.java | 9 --------- experiment/src/org/labkey/experiment/XarReader.java | 7 ------- .../org/labkey/experiment/api/ExperimentServiceImpl.java | 2 -- .../org/labkey/experiment/api/SampleTypeServiceImpl.java | 3 --- .../experiment/api/property/StorageProvisionerImpl.java | 5 ++++- 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java b/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java index 38d42d23233..af87f14db13 100644 --- a/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java +++ b/assay/api-src/org/labkey/api/assay/AssayResultDomainKind.java @@ -100,15 +100,6 @@ public Set getPropertyIndices(Domain domain) return PageFlowUtil.set(new PropertyStorageSpec.Index(false, AbstractTsvAssayProvider.DATA_ID_COLUMN_NAME)); } - @Override - public Set getPropertyForeignKeys(Container container) - { - return new HashSet<>(Arrays.asList( - new PropertyStorageSpec.ForeignKey(SpecialColumn.CreatedBy.name(), "core", "users", "userid", null, false), - new PropertyStorageSpec.ForeignKey(SpecialColumn.ModifiedBy.name(), "core", "users", "userid", null, false) - )); - } - @Override public DbScope getScope() { diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index c748a075e28..31791c10306 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -95,10 +95,8 @@ import org.labkey.api.exp.api.ExpRun; import org.labkey.api.exp.api.ExpSampleType; import org.labkey.api.exp.api.ExperimentService; -import org.labkey.api.exp.api.SampleTypeDomainKind; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; -import org.labkey.api.exp.property.DomainKind; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.exp.property.PropertyService; import org.labkey.api.exp.query.ExpMaterialTable; @@ -123,7 +121,6 @@ import org.labkey.experiment.api.AliasInsertHelper; import org.labkey.experiment.api.Data; import org.labkey.experiment.api.DataClass; -import org.labkey.experiment.api.DataClassDomainKind; import org.labkey.experiment.api.DataInput; import org.labkey.experiment.api.ExpDataClassImpl; import org.labkey.experiment.api.ExpDataImpl; @@ -896,10 +893,6 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { - DomainKind kind = domain.getDomainKind(); - if (kind instanceof SampleTypeDomainKind || kind instanceof DataClassDomainKind) - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 - domain.save(getUser()); DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues); } diff --git a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java index 46490f7c156..29ac035884b 100644 --- a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java @@ -8074,8 +8074,6 @@ else if (domain.getPropertyByName(propertyName) != null) // issue 25275 { OntologyManager.ensureObject(c, lsid.toString()); - if (kind != null) - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); domain.save(u, options == null ? null : options.getAuditRecordMap(), calculatedFields); impl.save(u); diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index f69d0948abe..241fa13a42b 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -835,10 +835,7 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo); DomainKind kind = domain.getDomainKind(); if (kind != null) - { domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); - domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117 - } Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); diff --git a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java index 3b13e69f3ff..56e7d5f3c26 100644 --- a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java +++ b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java @@ -213,7 +213,10 @@ private String _create(DbScope scope, DomainKind kind, Domain domain, boolean indices.addAll(domain.getPropertyIndices()); change.setIndexedColumns(domain, indices); - change.setForeignKeys(domain.getPropertyForeignKeys()); + // GitHub Issue 1117 + Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer())); + foreignKeys.addAll(domain.getPropertyForeignKeys()); + change.setForeignKeys(foreignKeys); try { From 01fce0991682113aefdaeec122aa06b1403e6a31 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 2 Jul 2026 12:55:49 -0700 Subject: [PATCH 6/8] clean --- .../src/org/labkey/experiment/api/SampleTypeServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index 241fa13a42b..9ba38e5d89b 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -836,7 +836,6 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri DomainKind kind = domain.getDomainKind(); if (kind != null) domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); - Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); Set lowerReservedNames = reservedNames.stream().map(String::toLowerCase).collect(Collectors.toSet()); From bbcfbabd19108d2ea0ae4666f325a6836e8b5c0d Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 2 Jul 2026 14:25:03 -0700 Subject: [PATCH 7/8] scale back change scope --- .../src/org/labkey/experiment/XarReader.java | 5 +++++ .../experiment/api/ExperimentServiceImpl.java | 2 ++ .../experiment/api/SampleTypeServiceImpl.java | 4 ++++ .../api/property/StorageProvisionerImpl.java | 14 ++++++++++---- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/experiment/src/org/labkey/experiment/XarReader.java b/experiment/src/org/labkey/experiment/XarReader.java index 31791c10306..599fdec5394 100644 --- a/experiment/src/org/labkey/experiment/XarReader.java +++ b/experiment/src/org/labkey/experiment/XarReader.java @@ -97,6 +97,7 @@ import org.labkey.api.exp.api.ExperimentService; import org.labkey.api.exp.api.SampleTypeService; import org.labkey.api.exp.property.Domain; +import org.labkey.api.exp.property.DomainKind; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.exp.property.PropertyService; import org.labkey.api.exp.query.ExpMaterialTable; @@ -893,6 +894,10 @@ private Domain loadDomain(DomainDescriptorType xDomain) throws ExperimentExcepti try { + DomainKind kind = domain.getDomainKind(); + if (kind != null) + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(getContainer())); // GitHub Issue 1117 + domain.save(getUser()); DefaultValueService.get().setDefaultValues(domain.getContainer(), newDefaultValues); } diff --git a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java index 29ac035884b..46490f7c156 100644 --- a/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java @@ -8074,6 +8074,8 @@ else if (domain.getPropertyByName(propertyName) != null) // issue 25275 { OntologyManager.ensureObject(c, lsid.toString()); + if (kind != null) + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); domain.save(u, options == null ? null : options.getAuditRecordMap(), calculatedFields); impl.save(u); diff --git a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java index 9ba38e5d89b..f69d0948abe 100644 --- a/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java +++ b/experiment/src/org/labkey/experiment/api/SampleTypeServiceImpl.java @@ -835,7 +835,11 @@ public ExpSampleTypeImpl createSampleType(Container c, User u, String name, Stri Domain domain = PropertyService.get().createDomain(c, lsid, name, templateInfo); DomainKind kind = domain.getDomainKind(); if (kind != null) + { domain.setDisabledSystemFields(kind.getDisabledSystemFields(disabledSystemField)); + domain.setPropertyForeignKeys(kind.getPropertyForeignKeys(c)); // GitHub Issue 1117 + } + Set reservedNames = kind.getReservedPropertyNames(domain, u); Set reservedPrefixes = kind.getReservedPropertyNamePrefixes(); Set lowerReservedNames = reservedNames.stream().map(String::toLowerCase).collect(Collectors.toSet()); diff --git a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java index 56e7d5f3c26..7ab6562f231 100644 --- a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java +++ b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java @@ -213,10 +213,16 @@ private String _create(DbScope scope, DomainKind kind, Domain domain, boolean indices.addAll(domain.getPropertyIndices()); change.setIndexedColumns(domain, indices); - // GitHub Issue 1117 - Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer())); - foreignKeys.addAll(domain.getPropertyForeignKeys()); - change.setForeignKeys(foreignKeys); + /* + * TODO: + * GitHub Issue 1117: Consider the generic fix below fore develop. See https://github.com/LabKey/platform/pull/7804 + * Tests may need updates and domains FKs (for example, issues) maybe need to adjusted. + * + * Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer())); + * foreignKeys.addAll(domain.getPropertyForeignKeys()); + * change.setForeignKeys(foreignKeys); + */ + change.setForeignKeys(domain.getPropertyForeignKeys()); try { From b175f9632f11e403c51b4aeb28a83d619b93c550 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 2 Jul 2026 17:03:52 -0700 Subject: [PATCH 8/8] spell --- .../labkey/experiment/api/property/StorageProvisionerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java index 7ab6562f231..21e4632f511 100644 --- a/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java +++ b/experiment/src/org/labkey/experiment/api/property/StorageProvisionerImpl.java @@ -215,7 +215,7 @@ private String _create(DbScope scope, DomainKind kind, Domain domain, boolean /* * TODO: - * GitHub Issue 1117: Consider the generic fix below fore develop. See https://github.com/LabKey/platform/pull/7804 + * GitHub Issue 1117: Consider the generic fix below for develop. See https://github.com/LabKey/platform/pull/7804 * Tests may need updates and domains FKs (for example, issues) maybe need to adjusted. * * Set foreignKeys = new LinkedHashSet<>(kind.getPropertyForeignKeys(domain.getContainer()));