← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13144: Event analytics, filterin fix

 

------------------------------------------------------------
revno: 13144
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-04 15:42:51 +0100
message:
  Event analytics, filterin fix
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-12-04 13:47:41 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-12-04 14:42:51 +0000
@@ -380,7 +380,7 @@
         {
             if ( item.hasFilter() )
             {                
-                sql += "and lower(" + statementBuilder.columnQuote( item.getItem().getUid() ) + ") " + item.getSqlOperator() + " " + getSqlFilter( item ) + " ";
+                sql += "and " + statementBuilder.columnQuote( item.getItem().getUid() ) + " " + item.getSqlOperator() + " " + getSqlFilter( item ) + " ";
             }
         }
         
@@ -388,7 +388,7 @@
         {
             if ( filter.hasFilter() )
             {                
-                sql += "and lower(" + statementBuilder.columnQuote( filter.getItem().getUid() ) + ") " + filter.getSqlOperator() + " " + getSqlFilter( filter ) + " ";
+                sql += "and " + statementBuilder.columnQuote( filter.getItem().getUid() ) + " " + filter.getSqlOperator() + " " + getSqlFilter( filter ) + " ";
             }
         }
 
@@ -409,7 +409,7 @@
         }
         
         operator = operator.toLowerCase();
-        filter = statementBuilder.encode( filter, false ).toLowerCase();
+        filter = statementBuilder.encode( filter, false );
         
         if ( operator.equals( "like" ) )
         {