dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14346
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-03-22 16:22:59 +0100
message:
  TEI search, minor improvement
modified:
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.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-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-03-20 07:03:51 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-03-22 15:22:59 +0000
@@ -159,7 +159,7 @@
         {
             String col = statementBuilder.columnQuote( item.getItemId() );
             
-            String joinClause = item.hasFilter() ? "inner join" : "full outer join"; //TODO left join?
+            String joinClause = item.hasFilter() ? "inner join" : "left join";
             
             sql += 
                 joinClause + " trackedentityattributevalue as " + col + " " +
@@ -205,7 +205,7 @@
         if ( params.hasProgram() )
         {
             sql += 
-                hlp.whereAnd() + " exists ( select trackedentityinstanceid from programinstance pi " +
+                hlp.whereAnd() + " exists (select trackedentityinstanceid from programinstance pi " +
                 "where pi.trackedentityinstanceid=tei.trackedentityinstanceid " +
                 "and pi.programid = " + params.getProgram().getId() + ") ";
         }