Skip to content

DatabaseIdentifier #937

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 4 commits into from
May 1, 2025
Merged

DatabaseIdentifier #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba2c9b7
DatabaseIdentifier
labkey-matthewb Mar 26, 2025
56953b3
Merge remote-tracking branch 'origin/develop' into fb_databaseidentifier
labkey-matthewb Apr 8, 2025
d50d984
cleanup
labkey-martyp Apr 11, 2025
3ac6190
Merge remote-tracking branch 'origin/develop' into fb_databaseidentifier
labkey-adam Apr 23, 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
10 changes: 2 additions & 8 deletions ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,10 @@ public Map<String, Map<String, Object>> getProperties(DefaultSchema defaultSchem
public void exec(ResultSet object) throws SQLException
{
Results rs = new ResultsImpl(object, cols);
String id = ti.getColumn("Id").getStringValue(rs);

String id = rs.getString(FieldKey.fromString(ti.getColumn("Id").getAlias()));

Map<String, Object> map = ret.get(id);
if (map == null)
map = new TreeMap<>();

Map<String, Object> map = ret.computeIfAbsent(id, (x)->new TreeMap<>());
processRow(rs, cols, map);

ret.put(id, map);
}
});
if (debugEnabled)
Expand Down
10 changes: 2 additions & 8 deletions ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,10 @@ public Map<String, Map<String, Object>> getProperties(DefaultSchema defaultSchem
public void exec(ResultSet object) throws SQLException
{
Results rs = new ResultsImpl(object, cols);
String id = ti.getColumn("Id").getStringValue(rs);

String id = rs.getString(FieldKey.fromString(ti.getColumn("Id").getAlias()));

Map<String, Object> map = ret.get(id);
if (map == null)
map = new HashMap<>();

Map<String, Object> map = ret.computeIfAbsent(id, (x)->new HashMap<>());
processRow(rs, cols, map);

ret.put(id, map);
}
});
}
Expand Down