From 6c62b30ce5d7ca84f318ab0b0cded77a0c5e26ac Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 5 Jan 2026 10:29:23 -0800
Subject: [PATCH 1/2] GitHub Issue 717: Reserve fields from ExpDataTable in
 DataClassDomainKind

---
 .../src/org/labkey/experiment/api/DataClassDomainKind.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
index 8ac2504a7b8..ad404359862 100644
--- a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
+++ b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
@@ -48,6 +48,7 @@
 import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.query.DataClassUserSchema;
 import org.labkey.api.exp.query.ExpDataClassDataTable;
+import org.labkey.api.exp.query.ExpDataTable;
 import org.labkey.api.gwt.client.DefaultValueType;
 import org.labkey.api.gwt.client.model.GWTDomain;
 import org.labkey.api.gwt.client.model.GWTPropertyDescriptor;
@@ -107,6 +108,8 @@ public class DataClassDomainKind extends AbstractDomainKind<DataClassDomainKindP
         names.addAll(Arrays.stream(ExpDataClassDataTable.Column.values()).map(ExpDataClassDataTable.Column::name).toList());
         names.add("RunId"); // Issue 50461
         names.add("Container");
+        // GitHub Issue 717
+        names.addAll(Arrays.stream(ExpDataTable.Column.values()).map(ExpDataTable.Column::name).toList());
 
         RESERVED_NAMES = DomainUtil.getNamesAndLabels(names);
 

From b40bca47df4b7f0b6ba15afa6d1f8bc4498a53e1 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Tue, 6 Jan 2026 12:11:56 -0800
Subject: [PATCH 2/2] Also reserve fields from ExpDataClassTable (to mirror
 what we do for sample types)

---
 .../src/org/labkey/experiment/api/DataClassDomainKind.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
index ad404359862..e440a6fb275 100644
--- a/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
+++ b/experiment/src/org/labkey/experiment/api/DataClassDomainKind.java
@@ -48,6 +48,7 @@
 import org.labkey.api.exp.property.DomainUtil;
 import org.labkey.api.exp.query.DataClassUserSchema;
 import org.labkey.api.exp.query.ExpDataClassDataTable;
+import org.labkey.api.exp.query.ExpDataClassTable;
 import org.labkey.api.exp.query.ExpDataTable;
 import org.labkey.api.gwt.client.DefaultValueType;
 import org.labkey.api.gwt.client.model.GWTDomain;
@@ -110,6 +111,7 @@ public class DataClassDomainKind extends AbstractDomainKind<DataClassDomainKindP
         names.add("Container");
         // GitHub Issue 717
         names.addAll(Arrays.stream(ExpDataTable.Column.values()).map(ExpDataTable.Column::name).toList());
+        names.addAll(Arrays.stream(ExpDataClassTable.Column.values()).map(ExpDataClassTable.Column::name).toList());
 
         RESERVED_NAMES = DomainUtil.getNamesAndLabels(names);