reduce dataset id collisions (#2707)

* Tweak to help keep generated ids of dataspace datasets separate from substudy datasets separate. * with null checks
LabKey · Oct 25, 2021 · c5b9a6d · c5b9a6d
1 parent 13b141b
commit c5b9a6d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/study/src/org/labkey/study/assay/StudyPublishManager.java b/study/src/org/labkey/study/assay/StudyPublishManager.java
@@ -873,7 +873,19 @@ public DatasetDefinition createDataset(User user, @NotNull DatasetDefinition.Bui
 
             // auto generate a dataset ID
             if (null == builder.getDatasetId())
-                builder.setDatasetId(new SqlSelector(schema, "SELECT MAX(n) + 1 AS id FROM (SELECT Max(datasetid) AS n FROM study.dataset WHERE container=? UNION SELECT ? As n) x", study.getContainer().getId(), MIN_ASSAY_ID).getObject(Integer.class));
+            {
+                int id = study.isDataspaceStudy() ? 10000 : MIN_ASSAY_ID;
+                Integer mx = new SqlSelector(schema, "SELECT MAX(datasetid) FROM study.dataset WHERE container=?", study.getContainer().getId()).getObject(Integer.class);
+                if (null != mx)
+                    id = Math.max(id,mx);
+                if (study.isDataspaceStudy())
+                {
+                    mx = new SqlSelector(schema, "SELECT MAX(datasetid) FROM study.dataset WHERE container=?", study.getContainer().getProject().getId()).getObject(Integer.class);
+                    if (null != mx)
+                       id = Math.max(id, mx);
+                }
+                builder.setDatasetId(id+1);
+            }
 
             DatasetDefinition dsd = builder.build();
             if (dsd.getUseTimeKeyField() && (dsd.isDemographicData() || dsd.getKeyPropertyName() != null))