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

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

Merged
merged 2 commits into from
Sep 15, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
567eafa
fix: fixed lower case for "IN" operator in queryFilters
gnespolino Sep 14, 2021
4e6f042
fix: quote only string values
gnespolino Sep 14, 2021
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
22 changes: 21 additions & 1 deletion dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/InQueryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 )
Copy link
Member

@larshelge larshelge Sep 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a description to explain the initial problem and why this fixes it :-) My understanding is we already quote event analytics query filters but I might be wrong.

{
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 ) )
{
Expand All @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ else if ( QueryOperator.IN.equals( operator ) )
return "'" + encodedFilter + "'";
}

private String quote( String filterItem )
protected String quote( String filterItem )
{
return "'" + filterItem + "'";
}
Expand Down
5 changes: 3 additions & 2 deletions ...tics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEnrollmentAnalyticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
5 changes: 3 additions & 2 deletions ...analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down