fix: fixed lower case for "IN" operator in queryFilters [DHIS2-11770] (…

…dhis2#8724) * fix: fixed lower case for "IN" operator in queryFilters * fix: quote only string values
davidhuser · Sep 15, 2021 · 5bfbec8 · 5bfbec8
1 parent 390a503
commit 5bfbec8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/InQueryFilter.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/InQueryFilter.java
@@ -31,6 +31,8 @@
 import static org.hisp.dhis.common.QueryOperator.IN;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -63,13 +65,16 @@ public InQueryFilter( String field, QueryFilter queryFilter )
      * @param encodedFilter actual "in" parameters
      * @return a SQL condition representing this InQueryFilter
      */
-    public String getSqlFilter( String encodedFilter )
+    public String getSqlFilter( String encodedFilter, boolean isText )
     {
         List<String> filterItems = getFilterItems( encodedFilter );
         String condition = "";
         if ( hasNonMissingValue( filterItems ) )
         {
             condition = field + " " + operator.getValue() + streamOfNonMissingValues( filterItems )
+                .filter( Objects::nonNull )
+                .map( item -> toLowerIfNecessary( item, isText ) )
+                .map( item -> quoteIfNecessary( item, isText ) )
                 .collect( Collectors.joining( ",", " (", ")" ) );
             if ( hasMissingValue( filterItems ) )
             {
@@ -87,6 +92,21 @@ public String getSqlFilter( String encodedFilter )
         return condition + " ";
     }
 
+    private String quoteIfNecessary( String item, boolean isText )
+    {
+        return isText ? quote( item ) : item;
+    }
+
+    private String toLowerIfNecessary( String item, boolean isText )
+    {
+        return isText ? item.toLowerCase() : item;
+    }
+
+    public String renderSqlFilter( boolean isText, Function<String, String> encoder )
+    {
+        return this.getSqlFilter( encoder.apply( this.getFilter() ), isText );
+    }
+
     private boolean hasMissingValue( List<String> filterItems )
     {
         return anyMatch( filterItems, this::isMissingItem );

diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java
@@ -146,7 +146,7 @@ else if ( QueryOperator.IN.equals( operator ) )
         return "'" + encodedFilter + "'";
     }
 
-    private String quote( String filterItem )
+    protected String quote( String filterItem )
     {
         return "'" + filterItem + "'";
     }

diff --git a/...tics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java b/...tics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
@@ -290,8 +290,9 @@ else if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.CHILDREN
 
                     if ( IN.equals( filter.getOperator() ) )
                     {
-                        QueryFilter inQueryFilter = new InQueryFilter( field, filter );
-                        sql += "and " + getSqlFilter( inQueryFilter, item );
+                        InQueryFilter inQueryFilter = new InQueryFilter( field, filter );
+                        sql += hlp.whereAnd() + " " + inQueryFilter.renderSqlFilter( item.isText(),
+                            toEncode -> statementBuilder.encode( toEncode, false ) );
                     }
                     else
                     {

diff --git a/...analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java b/...analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java
@@ -487,8 +487,9 @@ else if ( params.isOrganisationUnitMode( OrganisationUnitSelectionMode.CHILDREN
 
                     if ( IN.equals( filter.getOperator() ) )
                     {
-                        QueryFilter inQueryFilter = new InQueryFilter( field, filter );
-                        sql += hlp.whereAnd() + " " + getSqlFilter( inQueryFilter, item );
+                        InQueryFilter inQueryFilter = new InQueryFilter( field, filter );
+                        sql += hlp.whereAnd() + " " + inQueryFilter.renderSqlFilter( item.isText(),
+                            toEncode -> statementBuilder.encode( toEncode, false ) );
                     }
                     else
                     {