Case-insensitive check for field name

Author: bbimber

Studies/src/org/labkey/studies/query/StudiesTableCustomizer.java

@@ -2,6 +2,7 @@
 
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.logging.log4j.Logger;
+import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.collections.CaseInsensitiveKeyedHashSetValuedMap;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.TableCustomizer;
@@ -20,15 +21,26 @@ public void customize(TableInfo tableInfo)
         MultiValuedMap<String, String> props = new CaseInsensitiveKeyedHashSetValuedMap<>();
         if (tableInfo.getPkColumnNames().size() > 1)
         {
-            if (tableInfo.getPkColumnNames().contains("objectId"))
+            final CaseInsensitiveHashMap<String> keys = new CaseInsensitiveHashMap<>();
+            tableInfo.getPkColumnNames().forEach(x -> keys.put(x, x));
+
+            if (keys.containsKey("objectId"))
             {
-                props.put("primaryKeyField", "objectId");
+                props.put("primaryKeyField", keys.get("objectId"));
             }
             else if (tableInfo instanceof DatasetTable ds)
             {
                 if (ds.getDataset().isDemographicData())
                 {
-                    props.put("primaryKeyField", ds.getDataset().getStudy().getSubjectColumnName());
+                    String subjectCol = ds.getDataset().getStudy().getSubjectColumnName();
+                    if (keys.containsKey(subjectCol))
+                    {
+                        props.put("primaryKeyField", keys.get(subjectCol));
+                    }
+                    else
+                    {
+                        _log.error("Demographics dataset does not list subject col (" + subjectCol + ") as a PK. Table: " + tableInfo.getName());
+                    }
                 }
             }
         }