Skip to content
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

compositeId filled for reference type search parameters #4241

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −4
Open

compositeId filled for reference type search parameters #4241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9d110
compositeId added for ref_type search parameters.
berkant-k Nov 15, 2023
01baac1
Unittest are failing because of the name pattern. All objects includi…
berkant-k Nov 15, 2023
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: 1 addition & 1 deletion ...utils/src/main/java/org/linuxforhealth/fhir/database/utils/common/DataDefinitionUtil.java
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
* Handles common syntax for generating DDL
*/
public class DataDefinitionUtil {
private static final String NAME_PATTERN_RGX = "[a-zA-Z_][-\\w]*$";
private static final String NAME_PATTERN_RGX = "[a-zA-Z_][\\w]*$";
private static final Pattern NAME_PATTERN = Pattern.compile(NAME_PATTERN_RGX);

/**
2 changes: 1 addition & 1 deletion ...ava/org/linuxforhealth/fhir/persistence/params/database/PlainBatchParameterProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -333,7 +333,7 @@ public void process(String requestShard, String resourceType, String logicalId,

try {
PlainPostgresParameterBatch dao = getParameterBatchDao(resourceType);
dao.addReference(logicalResourceId, parameterNameValue.getParameterNameId(), refLogicalResourceId.getLogicalResourceId(), parameter.getRefVersionId());
dao.addReference(logicalResourceId, parameterNameValue.getParameterNameId(), refLogicalResourceId.getLogicalResourceId(), parameter.getRefVersionId(),parameter.getCompositeId());
} catch (SQLException x) {
throw new FHIRPersistenceException("Failed inserting security params for '" + resourceType + "'");
}
5 changes: 3 additions & 2 deletions ...java/org/linuxforhealth/fhir/persistence/params/database/PlainPostgresParameterBatch.java
View file
Original file line number Diff line number Diff line change
@@ -516,18 +516,19 @@ public void addSecurity(long logicalResourceId, long commonTokenValueId) throws
* @param refLogicalResourceId
* @param refVersionId
*/
public void addReference(long logicalResourceId, int parameterNameId, long refLogicalResourceId, Integer refVersionId) throws SQLException {
public void addReference(long logicalResourceId, int parameterNameId, long refLogicalResourceId, Integer refVersionId,Integer compositeId) throws SQLException {
logger.fine(() -> "Adding reference: parameterNameId:" + parameterNameId + " refLogicalResourceId:" + refLogicalResourceId + " refVersionId:" + refVersionId);
if (refs == null) {
final String tablePrefix = resourceType.toLowerCase();
final String insertString = "INSERT INTO " + tablePrefix + "_ref_values (parameter_name_id, logical_resource_id, ref_logical_resource_id, ref_version_id) VALUES (?,?,?,?)";
final String insertString = "INSERT INTO " + tablePrefix + "_ref_values (parameter_name_id, logical_resource_id, ref_logical_resource_id, ref_version_id,composite_id) VALUES (?,?,?,?,?)";
refs = connection.prepareStatement(insertString);
}
PreparedStatementHelper psh = new PreparedStatementHelper(refs);
psh.setInt(parameterNameId)
.setLong(logicalResourceId)
.setLong(refLogicalResourceId)
.setInt(refVersionId)
.setInt(compositeId)
.addBatch();
refCount++;
}