From ba2c9b7d8b12c6462638641e1720a4c0b650f9c5 Mon Sep 17 00:00:00 2001 From: labkey-matthewb Date: Wed, 26 Mar 2025 13:18:52 -0700 Subject: [PATCH 1/2] DatabaseIdentifier ColumnInfo.getAlias() ColumnInfo.getSelectName() --- .../ehr/demographics/AbstractDemographicsProvider.java | 10 ++-------- .../ehr/demographics/WeightsDemographicsProvider.java | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java index 7ef0c069c..8701854fb 100644 --- a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java +++ b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java @@ -116,16 +116,10 @@ public Map> 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 map = ret.get(id); - if (map == null) - map = new TreeMap<>(); - + Map map = ret.computeIfAbsent(id, (x)->new TreeMap<>()); processRow(rs, cols, map); - - ret.put(id, map); } }); if (debugEnabled) diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java index a66eb0cd0..33e419d8f 100644 --- a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java +++ b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java @@ -85,8 +85,7 @@ public Map> getProperties(DefaultSchema defaultSchem public void exec(ResultSet object) throws SQLException { Results rs = new ResultsImpl(object, cols); - - String id = rs.getString(FieldKey.fromString(ti.getColumn("Id").getAlias())); + String id = ti.getColumn("Id").getStringValue(rs); Map map = ret.get(id); if (map == null) From d50d984056f55ded470d380a4ccbefa7212d7580 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Fri, 11 Apr 2025 13:57:32 -0700 Subject: [PATCH 2/2] cleanup --- .../api/ehr/demographics/WeightsDemographicsProvider.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java index 33e419d8f..df9f2d58d 100644 --- a/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java +++ b/ehr/api-src/org/labkey/api/ehr/demographics/WeightsDemographicsProvider.java @@ -87,13 +87,8 @@ public void exec(ResultSet object) throws SQLException Results rs = new ResultsImpl(object, cols); String id = ti.getColumn("Id").getStringValue(rs); - Map map = ret.get(id); - if (map == null) - map = new HashMap<>(); - + Map map = ret.computeIfAbsent(id, (x)->new HashMap<>()); processRow(rs, cols, map); - - ret.put(id, map); } }); }