Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
80f24f4
Throw error if triggers modify columns
labkey-nicka Apr 1, 2026
a3990b8
Triggers: support managing columns for data iteration
labkey-nicka Apr 2, 2026
64e8df9
Second time (is not the charm)
labkey-nicka Apr 2, 2026
d6ad5a5
Third time (is the charm?)
labkey-nicka Apr 3, 2026
cebda66
DeltaTrackingMap
labkey-nicka Apr 3, 2026
c5d9b89
Use DeltaTrackingMap
labkey-nicka Apr 3, 2026
44826dd
Pass insertOption through triggers beforeInsert/Update
labkey-nicka Apr 3, 2026
6795e0e
volatile
labkey-nicka Apr 3, 2026
80ccf08
Trigger interface changes
labkey-nicka Apr 3, 2026
129747f
Experimental feature flag, review feedback
labkey-nicka Apr 3, 2026
c7845ef
Pass insertOption through setUpdateManagedColumns
labkey-nicka Apr 6, 2026
6a44dba
Document utilities
labkey-nicka Apr 6, 2026
2cc7558
Revise experimental flag
labkey-nicka Apr 6, 2026
c9e9b1e
addGlobalError
labkey-nicka Apr 6, 2026
a2cdb78
Review feedback, remove manageColumns flag
labkey-nicka Apr 9, 2026
fc32a1a
Support disabling managed columns from a trigger
labkey-nicka Apr 9, 2026
cf6cfc5
Additional checks for isManagedColumnsEnabled
labkey-nicka Apr 9, 2026
db870c4
table.getColumn(name, false /* do not try to resolve */)
labkey-nicka Apr 9, 2026
d5c085c
Issue 46857: revert "isNewFolderImport"
labkey-nicka Apr 10, 2026
06fb44e
WellTriggerFactory: add ignored
labkey-nicka Apr 10, 2026
b18a607
resetTriggers
labkey-nicka Apr 11, 2026
7c0fe94
DeltaTrackingMap.wrap
labkey-nicka Apr 11, 2026
8625910
setInsertManagedColumns: supply table to determine supported operations
labkey-nicka Apr 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/org/labkey/api/ApiModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.labkey.api.collections.CaseInsensitiveHashSet;
import org.labkey.api.collections.CaseInsensitiveMapWrapper;
import org.labkey.api.collections.CollectionUtils;
import org.labkey.api.collections.DeltaTrackingMap;
import org.labkey.api.collections.LabKeyCollectors;
import org.labkey.api.collections.Sampler;
import org.labkey.api.collections.SwapQueue;
Expand Down Expand Up @@ -385,6 +386,7 @@ public void registerServlets(ServletContext servletCtx)
DatabaseCache.TestCase.class,
DateUtil.TestCase.class,
DbScope.DialectTestCase.class,
DeltaTrackingMap.TestCase.class,
DetailsURL.TestCase.class,
DiskCachingDataIterator.DiskTestCase.class,
EmailTemplate.TestCase.class,
Expand Down
6 changes: 0 additions & 6 deletions api/src/org/labkey/api/admin/FolderImportContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@

import static org.labkey.api.exp.XarContext.XAR_JOB_ID_NAME;

/**
* User: cnathe
* Date: Jan 18, 2012
*/
public class FolderImportContext extends AbstractFolderContext
{
private FileLike _folderXml;
Expand All @@ -57,8 +53,6 @@ public class FolderImportContext extends AbstractFolderContext

private boolean _isNewFolderImport; // if we know the target folder is empty, can skip certain merge logic

public static final String IS_NEW_FOLDER_IMPORT_KEY = "isNewFolderImport";

/** Required for xstream serialization on Java 7 */
@SuppressWarnings({"UnusedDeclaration"})
public FolderImportContext()
Expand Down
Loading
Loading