Merge branch 'release/v0.16.5'

ehrbase · Apr 20, 2021 · de11fdc · de11fdc
2 parents 0b694da + 1b2e177
commit de11fdc
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 127 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/application/pom.xml b/application/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/base/pom.xml b/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/ehrbase-log b/ehrbase-log
diff --git a/jooq-pq/pom.xml b/jooq-pq/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <packaging>pom</packaging>
     <groupId>org.ehrbase.openehr</groupId>
     <artifactId>server</artifactId>
-    <version>0.16.4</version>
+    <version>0.16.5</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>EHRbase is a Free, Libre, Open Source openEHR Clinical Data Repository</description>
@@ -130,7 +130,7 @@
         <swagger.version>1.6.2</swagger.version>
         <swagger-snapshot.version>2.0.0-rc2</swagger-snapshot.version>
         <postgressql.version>42.2.18</postgressql.version>
-        <ehrbase.sdk.version>2930e3e</ehrbase.sdk.version>
+        <ehrbase.sdk.version>bcc19c2</ehrbase.sdk.version>
         <flyway.version>6.5.7</flyway.version>
         <joda.version>2.10.6</joda.version>
         <database.name>ehrbase</database.name>

diff --git a/rest-ehr-scape/pom.xml b/rest-ehr-scape/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/rest-openehr/pom.xml b/rest-openehr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/service/pom.xml b/service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>server</artifactId>
         <groupId>org.ehrbase.openehr</groupId>
-        <version>0.16.4</version>
+        <version>0.16.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/service/src/main/java/org/ehrbase/aql/sql/binding/WhereBinder.java b/service/src/main/java/org/ehrbase/aql/sql/binding/WhereBinder.java
@@ -246,14 +246,7 @@ public Condition bind(String templateId) {
                 TaggedStringBuilder taggedStringBuilder = new TaggedStringBuilder();
                 if (isFollowedBySQLConditionalOperator(cursor)) {
                     TaggedStringBuilder encodedVar = encodeWhereVariable(templateId, (I_VariableDefinition) item, true, null);
-                    String expanded = expandForCondition(encodedVar);
-                    if (new WhereSetReturningFunction(expanded).isUsed() && new InSetWhereClause(whereItems).isInSubQueryExpression(cursor)){
-                        //insert new LATERAL pseudo table to the variable if not yet defined
-                        if (!((I_VariableDefinition) item).isLateralJoin()) {
-                            encodeLateral(encodedVar, (I_VariableDefinition)item );
-                        }
-                        expanded = ((I_VariableDefinition) item).getAlias();
-                    }
+                    String expanded = expandForLateral(encodedVar, (I_VariableDefinition)item );
                     if (expanded != null)
                         taggedStringBuilder.append(expanded);
                     else {
@@ -274,7 +267,7 @@ public Condition bind(String templateId) {
                     } else {
                         //if the path contains node predicate expression uses a SQL syntax instead of jsquery
                         if (new VariablePath(((I_VariableDefinition) item).getPath()).hasPredicate()) {
-                            String expanded = expandForCondition(encodeWhereVariable(templateId, (I_VariableDefinition) item, true, null));
+                            String expanded = expandForLateral(encodeWhereVariable(templateId, (I_VariableDefinition) item, true, null), (I_VariableDefinition)item );
                             if (expanded != null)
                                 taggedStringBuilder.append(expanded);
                             else {
@@ -284,23 +277,12 @@ public Condition bind(String templateId) {
                             isFollowedBySQLConditionalOperator = true;
                             requiresJSQueryClosure = false;
                         } else {
-                            //check if a comparison item is a date, then force SQL if any
-                            if (item instanceof  VariableDefinition && new WhereTemporal(whereItems).containsTemporalItem((VariableDefinition)item) || new WhereEvaluation(whereItems).requiresSQL()) {
-                                String expanded = expandForCondition(encodeWhereVariable(templateId, (I_VariableDefinition) item, true, null));
-                                if (expanded != null)
-                                    taggedStringBuilder.append(expanded);
-                                else {
-                                    unresolvedVariable = true;
-                                    break;
-                                }
-                            } else {
-                                String expanded = expandForCondition(encodeWhereVariable(templateId, (I_VariableDefinition) item, false, null));
-                                if (expanded != null)
-                                    taggedStringBuilder.append(expanded);
-                                else {
-                                    unresolvedVariable = true;
-                                    break;
-                                }
+                            String expanded = expandForLateral(encodeWhereVariable(templateId, (I_VariableDefinition) item, true, null), (I_VariableDefinition)item );
+                            if (expanded != null)
+                                taggedStringBuilder.append(expanded);
+                            else {
+                                unresolvedVariable = true;
+                                break;
                             }
                         }
                     }
@@ -418,6 +400,19 @@ private String expandForCondition(TaggedStringBuilder taggedStringBuilder) {
         return wrapped;
     }
 
+    private String expandForLateral( TaggedStringBuilder encodedVar, I_VariableDefinition item){
+        String expanded = expandForCondition(encodedVar);
+        if (new WhereSetReturningFunction(expanded).isUsed()){
+            //insert new LATERAL pseudo table to the variable if not yet defined
+            if (!item.isLateralJoin()) {
+                encodeLateral(encodedVar, item );
+            }
+            expanded = item.getAlias();
+        }
+
+        return expanded;
+    }
+
     private void encodeLateral(TaggedStringBuilder encodedVar, I_VariableDefinition item){
         if (encodedVar == null)
             return;