Skip to content

Issue 53804: Cross type import converts strings 'Yes' and 'No' to their boolean values #7128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XingY merged 2 commits into from
Oct 16, 2025
Merged

Issue 53804: Cross type import converts strings 'Yes' and 'No' to their boolean values #7128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b8e7f7
Issue 53804: Cross type import converts strings 'Yes' and 'No' to the…
XingY Oct 15, 2025
9ea8e64
revert crlf
XingY Oct 16, 2025
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
11 changes: 5 additions & 6 deletions api/src/org/labkey/api/query/AbstractQueryImportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ else if (!dataFileDir.exists())
//di = wrap(di, ve);
//importData(di, ve);

configureLoader(loader);
configureLoader(loader, _target, getRenamedColumns(), allowLineageColumns(), getLineageImportAliases(), getOptionParamsMap());

TransactionAuditProvider.TransactionAuditEvent auditEvent = null;
if (behaviorType != null && behaviorType != AuditBehaviorType.NONE)
Expand Down Expand Up @@ -669,13 +669,12 @@ else if (!dataFileDir.exists())

}

protected void configureLoader(DataLoader loader) throws IOException
public static void configureLoader(DataLoader loader, @Nullable TableInfo target, @Nullable Map<String, String> renamedColumns, boolean allowLineageColumns, @Nullable Set<String> lineageAliasNames, @Nullable Map<Params, Boolean> optionParamsMap) throws IOException
{
configureLoader(loader, _target, getRenamedColumns(), allowLineageColumns(), null);
}
// Issue 53804: When updating or adding samples across different sample types, the strings 'Yes' and 'No' are converted to their boolean values
if (loader != null && optionParamsMap != null && optionParamsMap.getOrDefault(Params.crossTypeImport, false))
loader.setInferTypes(false);

public static void configureLoader(DataLoader loader, @Nullable TableInfo target, @Nullable Map<String, String> renamedColumns, boolean allowLineageColumns, @Nullable Set<String> lineageAliasNames) throws IOException
{
//apply known columns so loader can do better type conversion
if (loader != null && target != null)
loader.setKnownColumns(target.getColumns());
Expand Down
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/query/QueryImportPipelineJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public void run()

loader = DataLoader.get().createLoader(_importContextBuilder.getPrimaryFile(), _importContextBuilder.getFileContentType(), _importContextBuilder.isHasColumnHeaders(), null, null);

AbstractQueryImportAction.configureLoader(loader, target, _importContextBuilder.getRenamedColumns(), _importContextBuilder.allowLineageColumns(), _importContextBuilder.getLineageImportAliases());
AbstractQueryImportAction.configureLoader(loader, target, _importContextBuilder.getRenamedColumns(), _importContextBuilder.allowLineageColumns(), _importContextBuilder.getLineageImportAliases(), _importContextBuilder.getOptionParamsMap());

TransactionAuditProvider.TransactionAuditEvent auditEvent = null;

Expand Down
2 changes: 1 addition & 1 deletion experiment/src/org/labkey/experiment/ExpDataIterators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2555,7 +2555,7 @@ private int _importSplitFile(TypeData typeData, File splitFile, Container dataCo
else
aliasNames = new CaseInsensitiveHashSet(((ExpDataClass) typeData.dataType).getImportAliases().keySet());
// We do not need to configure the loader for renamed columns as that has been taken care of when writing the file.
configureLoader(loader, dataTable, null, true, aliasNames);
configureLoader(loader, dataTable, null, true, aliasNames, null /* Not needed since partition is not a cross type import*/);
if (loader instanceof TabLoader tabLoader)
tabLoader.setIncludeComments(true); // don't skip lines that starts with "#" (if the original file is Excel)
return updateService.loadRows(_user, dataContainer, loader, _context, null);
Expand Down
13 changes: 0 additions & 13 deletions experiment/src/org/labkey/experiment/controllers/exp/ExperimentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4502,13 +4502,6 @@ protected JSONObject createSuccessResponse(int rowCount)
return json;
}

@Override
protected void configureLoader(DataLoader loader) throws IOException
{
if (getOptionParamValue(Params.crossTypeImport))
loader.setInferTypes(false);
configureLoader(loader, _target, getRenamedColumns(), allowLineageColumns(), getLineageImportAliases());
}
}

public abstract static class AbstractExpDataImportAction extends AbstractQueryImportAction<QueryForm>
Expand Down Expand Up @@ -4667,12 +4660,6 @@ public void addNavTrail(NavTree root)
root.addChild("Import Data");
}

@Override
protected void configureLoader(DataLoader loader) throws IOException
{
configureLoader(loader, _target, getRenamedColumns(), allowLineageColumns(), getLineageImportAliases());
}

}

@RequiresPermission(UpdatePermission.class)
Expand Down