honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1471 from hapifhir/2023-10-gg-snapshot-fix 

2023 10 gg snapshot fix
This commit is contained in:
Grahame Grieve 2023-10-25 07:31:05 +11:00 committed by GitHub
parent 2732c41d08 238793b4a4
commit a359f8e9fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/profile/ProfilePathProcessor.java
View File

@ -165,7 +165,7 @@ public class ProfilePathProcessor {
ElementDefinition res = null; ElementDefinition res = null;
List<TypeSlice> typeList = new ArrayList<>(); List<TypeSlice> typeList = new ArrayList<>();
// just repeat processing entries until we run out of our allowed scope (1st entry, the allowed scope is all the entries) // just repeat processing entries until we run out of our allowed scope (1st entry, the allowed scope is all the entries)
while (cursors.baseCursor <= getBaseLimit()) { while (cursors.baseCursor <= getBaseLimit() && cursors.baseCursor < cursors.base.getElement().size()) {
// get the current focus of the base, and decide what to do // get the current focus of the base, and decide what to do
ElementDefinition currentBase = cursors.base.getElement().get(cursors.baseCursor); ElementDefinition currentBase = cursors.base.getElement().get(cursors.baseCursor);
String currentBasePath = profileUtilities.fixedPathSource(getContextPathSource(), currentBase.getPath(), getRedirector()); String currentBasePath = profileUtilities.fixedPathSource(getContextPathSource(), currentBase.getPath(), getRedirector());

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/sql/Runner.java
View File

@ -135,7 +135,7 @@ public class Runner implements IEvaluationContext {
focus.add(b); focus.add(b);
} }
// } else if (select.has("union")) { // } else if (select.has("unionAll")) {
// focus.addAll(executeUnion(select, b)); // focus.addAll(executeUnion(select, b));
List<List<Cell>> tempRows = new ArrayList<>(); List<List<Cell>> tempRows = new ArrayList<>();
@ -149,7 +149,7 @@ public class Runner implements IEvaluationContext {
executeColumn(column, f, rowsToAdd); executeColumn(column, f, rowsToAdd);
} }
for (JsonObject sub : select.getJsonObjects("union")) { for (JsonObject sub : select.getJsonObjects("unionAll")) {
executeSelect(sub, f, rowsToAdd); executeSelect(sub, f, rowsToAdd);
} }

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/sql/Validator.java
View File

@ -106,8 +106,8 @@ public class Validator {
checkForEach(path, viewDefinition, viewDefinition.get("forEach"), t); checkForEach(path, viewDefinition, viewDefinition.get("forEach"), t);
} else if (viewDefinition.has("forEachOrNull")) { } else if (viewDefinition.has("forEachOrNull")) {
checkForEachOrNull(path, viewDefinition, viewDefinition.get("forEachOrNull"), t); checkForEachOrNull(path, viewDefinition, viewDefinition.get("forEachOrNull"), t);
} else if (viewDefinition.has("union")) { } else if (viewDefinition.has("unionAll")) {
checkUnion(path, viewDefinition, viewDefinition.get("union"), t); checkUnion(path, viewDefinition, viewDefinition.get("unionAll"), t);
} else { } else {
i = 0; i = 0;
if (checkAllObjects(path, viewDefinition, "select")) { if (checkAllObjects(path, viewDefinition, "select")) {
@ -135,8 +135,8 @@ public class Validator {
if (t != null) { if (t != null) {
boolean content = false; boolean content = false;
if (select.has("union")) { if (select.has("unionAll")) {
content = checkUnion(path, select, select.get("union"), t); content = checkUnion(path, select, select.get("unionAll"), t);
} }
if (select.has("column")) { if (select.has("column")) {
@ -181,7 +181,7 @@ public class Validator {
private boolean checkUnion(String path, JsonObject focus, JsonElement expression, TypeDetails t) { private boolean checkUnion(String path, JsonObject focus, JsonElement expression, TypeDetails t) {
JsonElement a = focus.get("union"); JsonElement a = focus.get("unionAll");
if (!(a instanceof JsonArray)) { if (!(a instanceof JsonArray)) {
error(path+".union", a, "union is not an array", IssueType.INVALID); error(path+".union", a, "union is not an array", IssueType.INVALID);
return false; return false;