Refinements to customizer code, and many new SIV-related ETLs

Author: bbimber

LDK/src/org/labkey/ldk/query/DefaultTableCustomizer.java

@@ -125,7 +125,21 @@ private void setDetailsUrl(AbstractTableInfo ti)
         assert queryName != null;
 
         List<String> keyFields = ti.getPkColumnNames();
-        assert keyFields.size() > 0 : "No key fields found for the table: " + ti.getPublicSchemaName() + "." + ti.getPublicName();
+        assert !keyFields.isEmpty() : "No key fields found for the table: " + ti.getPublicSchemaName() + "." + ti.getPublicName();
+
+        if (_settings.getPrimaryKeyField() != null)
+        {
+            String alternatePK = _settings.getPrimaryKeyField();
+            if (!keyFields.contains(alternatePK))
+            {
+                _log.error("Table: " + ti.getUserSchema().getSchemaName() + "." + ti.getPublicName() + " supplied an alternate primaryKeyField that doesnt match actual PKs: " + alternatePK);
+                return;
+            }
+
+            keyFields.clear();
+            keyFields.add(alternatePK);
+        }
+
         if (keyFields.size() != 1)
         {
             _log.error("Table: " + ti.getUserSchema().getSchemaName() + "." + ti.getPublicName() + " has more than 1 PK: " + StringUtils.join(keyFields, ";") + ", cannot apply custom links - please update the TableCustomizer properties");
@@ -159,14 +173,28 @@ else if (_settings.isSetEditLinkOverrides())
             assert queryName != null;
 
             List<String> keyFields = ti.getPkColumnNames();
-            assert keyFields.size() > 0 : "No key fields found for the table: " + ti.getPublicSchemaName() + "." + ti.getPublicName();
+            assert !keyFields.isEmpty() : "No key fields found for the table: " + ti.getPublicSchemaName() + "." + ti.getPublicName();
+
+            if (_settings.getPrimaryKeyField() != null)
+            {
+                String alternatePK = _settings.getPrimaryKeyField();
+                if (!keyFields.contains(alternatePK))
+                {
+                    _log.error("Table: " + ti.getUserSchema().getSchemaName() + "." + ti.getPublicName() + " supplied an alternate primaryKeyField that doesnt match actual PKs: " + alternatePK);
+                    return;
+                }
+
+                keyFields.clear();
+                keyFields.add(alternatePK);
+            }
+
             if (keyFields.size() != 1)
             {
                 _log.error("Table: " + schemaName + "." + queryName + " has more than 1 PK: " + StringUtils.join(keyFields, ";") + ", cannot apply custom links - please update the TableCustomizer properties");
                 return;
             }
 
-            if (schemaName != null && queryName != null && keyFields.size() > 0)
+            if (schemaName != null && queryName != null && !keyFields.isEmpty())
             {
                 String keyField = keyFields.get(0);
                 if (!AbstractTableInfo.LINK_DISABLER_ACTION_URL.equals(ti.getImportDataURL(ti.getUserSchema().getContainer())))
@@ -445,7 +473,8 @@ public enum PROPERIES
             setEditLinkOverrides(Boolean.class, true),
             auditMode(String.class, AuditBehaviorType.DETAILED.name()),
             disableFacetingForNumericCols(Boolean.class, true),
-            overrideDetailsUrl(Boolean.class, true);
+            overrideDetailsUrl(Boolean.class, true),
+            primaryKeyField(String.class, null);
 
             private final Class _clazz;
             private final Object _defaultVal;
@@ -531,6 +560,17 @@ public AuditBehaviorType getAuditMode()
             return AuditBehaviorType.DETAILED;
         }
 
+        public String getPrimaryKeyField()
+        {
+            Object fieldName = getProperty(PROPERIES.primaryKeyField);
+            if (fieldName != null)
+            {
+                return fieldName.toString();
+            }
+
+            return null;
+        }
+
         public boolean isDisableFacetingForNumericCols()
         {
             return (boolean)getProperty(PROPERIES.disableFacetingForNumericCols);