Skip to content

use appendInClauseSql() #7878

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
labkey-matthewb merged 2 commits into from
Jul 23, 2026
Merged

use appendInClauseSql() #7878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80ead23
use SqlDialect.appendInClauseSql() for cleaner code.
labkey-matthewb Jul 23, 2026
c0cc423
and for delete as well
labkey-matthewb Jul 23, 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
26 changes: 8 additions & 18 deletions study/src/org/labkey/study/model/DatasetDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,7 @@ private HashMap<String, Object[]> checkAndDeleteDupes(DataIterator rows,
// duplicate keys found in error
final LinkedHashMap<String,Object[]> noDeleteMap = new LinkedHashMap<>();

StringBuilder sbIn = new StringBuilder();
ArrayList<String> idList = new ArrayList<>();
final Map<String, Object[]> uriMap = new HashMap<>();
int count = 0;
while (rows.next())
Expand Down Expand Up @@ -2527,12 +2527,9 @@ private HashMap<String, Object[]> checkAndDeleteDupes(DataIterator rows,
noDeleteMap.put(uniq,key);

// partial fix for 16647, we should handle the replace case differently (do we ever replace?)
String sep = "";
if (uriMap.size() < 10000 || Boolean.TRUE==replace)
{
if (uniq.contains(("'")))
uniq = uniq.replaceAll("'","''");
sbIn.append(sep).append("'").append(uniq).append("'");
idList.add(uniq);
}
count++;
}
Expand All @@ -2549,7 +2546,7 @@ private HashMap<String, Object[]> checkAndDeleteDupes(DataIterator rows,
return null;
}
else // also check target dataset
return checkTargetDupesAndDelete(isDemographic, noDeleteMap, sbIn, uriMap);
return checkTargetDupesAndDelete(isDemographic, noDeleteMap, idList, uriMap);
}
catch (BatchValidationException vex)
{
Expand All @@ -2569,14 +2566,15 @@ private HashMap<String, Object[]> checkAndDeleteDupes(DataIterator rows,
}
}

private HashMap<String, Object[]> checkTargetDupesAndDelete(final boolean demographic, final LinkedHashMap<String, Object[]> noDeleteMap, StringBuilder sbIn, final Map<String, Object[]> uriMap)
private HashMap<String, Object[]> checkTargetDupesAndDelete(final boolean demographic, final LinkedHashMap<String, Object[]> noDeleteMap, ArrayList<String> idList, final Map<String, Object[]> uriMap)
{
// duplicate keys found that should be deleted
final Set<String> deleteSet = new HashSet<>();

TableInfo tinfo = getStorageTableInfo(false);
SimpleFilter filter = new SimpleFilter();
filter.addWhereClause((demographic ?"ParticipantId":"LSID") + " IN (" + sbIn + ")", new Object[]{});
SQLFragment checkInClause = tinfo.getSqlDialect().appendInClauseSql(new SQLFragment(demographic ?"ParticipantId":"LSID"), idList);
filter.addWhereClause(checkInClause);
if (isShared())
{
Container rowsContainer = getContainer();
Expand Down Expand Up @@ -2610,16 +2608,8 @@ private HashMap<String, Object[]> checkTargetDupesAndDelete(final boolean demogr
return null;

SimpleFilter deleteFilter = new SimpleFilter();
StringBuilder sbDelete = new StringBuilder();
String sep = "";
for (String s : deleteSet)
{
if (s.contains(("'")))
s = s.replaceAll("'","''");
sbDelete.append(sep).append("'").append(s).append("'");
sep = ", ";
}
deleteFilter.addWhereClause("LSID IN (" + sbDelete + ")", new Object[]{});
SQLFragment deleteInClause = tinfo.getSqlDialect().appendInClauseSql(new SQLFragment("LSID"), deleteSet);
deleteFilter.addWhereClause(deleteInClause);
Table.delete(tinfo, deleteFilter);

return null;
Expand Down