Issue 52098: Switch lookupByAlternateKey to enum with three choices

labkey-susanh · labkey-susanh · commit 76e4ebb1aeb4 · 2025-04-14T06:54:48.000-07:00
diff --git a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java
@@ -323,7 +323,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr
             auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT);
 
         AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,
-                new HashMap<>(), errors, behaviorType, auditEvent, null, user, container, null);
+                new HashMap<>(), null, errors, behaviorType, auditEvent, null, user, container, null);
     }
 
     private static class TsvImport
diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java
@@ -1493,7 +1493,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo
                     auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT);
 
                 AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,
-                        new HashMap<>(), batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);
+                        new HashMap<>(), null, batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);
 
                 if (batchErrors.hasErrors())
                 {

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr`
`323`	`323`	`auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT);`
`324`	`324`
`325`	`325`	`AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,`
`326`		`- new HashMap<>(), errors, behaviorType, auditEvent, null, user, container, null);`
	`326`	`+ new HashMap<>(), null, errors, behaviorType, auditEvent, null, user, container, null);`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`private static class TsvImport`
Original file line number	Diff line number	Diff line change
`@@ -1493,7 +1493,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo`
`1493`	`1493`	`auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT);`
`1494`	`1494`
`1495`	`1495`	`AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT,`
`1496`		`- new HashMap<>(), batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);`
	`1496`	`+ new HashMap<>(), null, batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null);`
`1497`	`1497`
`1498`	`1498`	`if (batchErrors.hasErrors())`
`1499`	`1499`	`{`