Remove altUpdateKeys from QueryInfo

Author: XingY

api/src/org/labkey/api/audit/AuditHandler.java

@@ -124,7 +124,7 @@ static Pair<Map<String, Object>, Map<String, Object>> getOldAndNewRecordForMerge
                 }
             }
 
-            boolean isAliasInput = row.containsKey(ExperimentService.ALIASCOLUMNALIAS) && ExpMaterialTable.Column.Alias.name().equalsIgnoreCase(lcName);
+            boolean isAliasInput = row.containsKey(ExperimentService.ALIASCOLUMNALIAS) && "Alias".equalsIgnoreCase(lcName);
 
             boolean isExtraAuditField = extraFieldsToInclude != null && extraFieldsToInclude.contains(nameFromAlias);
             if (!excludedFromDetailDiff.contains(nameFromAlias) && (row.containsKey(nameFromAlias) || isExpInput || isAliasInput))

api/src/org/labkey/api/data/TableInfo.java

@@ -58,7 +58,10 @@ public DataClassUpdateAddColumnsDataIterator(DataIterator in, @NotNull DataItera
 
         var map = DataIteratorUtil.createColumnNameMap(in);
 
-        this._lsidColIndex = map.get(ExpDataTable.Column.LSID.name());
+        Integer lsidIdx = map.get(ExpDataTable.Column.LSID.name());
+        if (lsidIdx == null)
+            throw new IllegalStateException("LSID column not found in input.");
+        this._lsidColIndex = lsidIdx;
 
         Integer index = map.get(keyColumnName);
         ColumnInfo col = target.getColumn(keyColumnName);
@@ -190,4 +193,4 @@ public boolean next() throws BatchValidationException
 
         return ret;
     }
-}
+}

api/src/org/labkey/api/dataiterator/DataClassUpdateAddColumnsDataIterator.java

@@ -540,7 +540,7 @@ public Object get(int i)
         {
             Object value = _keyValues.get(i);
             if (value != null)
-                return value;
+                return value; // TODO, why is this needed?
         }
 
         return _data.get(i);

api/src/org/labkey/api/dataiterator/StatementDataIterator.java

@@ -914,7 +914,7 @@ public DataIterator getDataIterator(DataIteratorContext context)
             else if (_isSample)
                 di = new SampleUpdateDerivationDataIterator(di, context, _container, _user, _currentDataType, _checkRequiredParents);
             else
-                di = new DataUpdateDerivationDataIterator(di, context, _container, _user, _currentDataType, _checkRequiredParents);//
+                di = new DataUpdateDerivationDataIterator(di, context, _container, _user, _currentDataType, _checkRequiredParents);
 
             return LoggingDataIterator.wrap(di);
         }
@@ -1185,7 +1185,7 @@ public boolean next() throws BatchValidationException
             // For each iteration, collect the parent col values
             if (hasNext)
             {
-                String lsid = (String) get(_lsidCol); // why lsid?, insert or merge
+                String lsid = (String) get(_lsidCol);
                 String name = null;
                 if (_nameCol != null)
                     name = (String) get(_nameCol);

experiment/src/org/labkey/experiment/ExpDataIterators.java

@@ -819,7 +819,7 @@ public static void shortenAllStorageNames(ModuleContext context)
     }
 
     /**
-     * Called from exp-26.004-26.005.sql
+     * Called from exp-26.005-26.006.sql
      * Drop the lsid column from existing provisioned DataClass tables.
      */
     @SuppressWarnings("unused")

experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java

@@ -170,11 +170,9 @@ public class ExpDataClassDataTableImpl extends ExpRunItemTableImpl<ExpDataClassD
     public static final String DATA_COUNTER_SEQ_PREFIX = "DataNameGenCounter-";
 
     public static final Set<String> DATA_CLASS_ALT_MERGE_KEYS;
-    public static final Set<String> DATA_CLASS_ALT_UPDATE_KEYS;
     private static final Set<String> ALLOWED_IMPORT_HEADERS;
     static {
         DATA_CLASS_ALT_MERGE_KEYS = new HashSet<>(Arrays.asList(Column.ClassId.name(), Name.name()));
-        DATA_CLASS_ALT_UPDATE_KEYS = new HashSet<>(Arrays.asList(Column.RowId.name()));
         ALLOWED_IMPORT_HEADERS = new HashSet<>(Arrays.asList("description", "flag", "comment", "alias", "datafileurl"));
     }
 
@@ -862,13 +860,6 @@ public CaseInsensitiveHashMap<String> remapSchemaColumns()
         return DATA_CLASS_ALT_MERGE_KEYS;
     }
 
-    @Override
-    @NotNull
-    public Set<String> getAltKeysForUpdate()
-    {
-        return DATA_CLASS_ALT_UPDATE_KEYS;
-    }
-
     @Override
     public @Nullable Set<String> getExistingRecordKeyColumnNames(DataIteratorContext context, Map<String, Integer> colNameMap)
     {
@@ -1318,7 +1309,7 @@ public Map<Integer, Map<String, Object>> getExistingRows(User user, Container co
 
             Set<String> lsids = new HashSet<>();
             for (Map<String, Object> dataRow : dataRows.values())
-                lsids.add((String) dataRow.get("lsid")); // ?
+                lsids.add((String) dataRow.get("lsid"));
             List<ExpDataImpl> seeds = ExperimentServiceImpl.get().getExpDatasByLSID(lsids);
 
             ExperimentServiceImpl.get().addRowsParentsFields(new HashSet<>(seeds), dataRows, user, container);