dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3697
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-05-22 15:02:32 +0200
message:
  Fixed bug, source table still referenced in followup analysis query
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.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-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java	2011-01-20 06:56:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java	2011-05-22 13:02:32 +0000
@@ -183,8 +183,7 @@
             "JOIN dataelement AS de ON (dv.dataelementid = de.dataelementid) " +
             "JOIN period AS pe ON (dv.periodid = pe.periodid) " +
             "JOIN periodtype AS pt ON (pe.periodtypeid = pt.periodtypeid) " +
-            "JOIN source AS sr ON (dv.sourceid = sr.sourceid) " +
-            "LEFT JOIN organisationunit AS ou ON (ou.organisationunitid = sr.sourceid) " +
+            "LEFT JOIN organisationunit AS ou ON (ou.organisationunitid = dv.sourceid) " +
             "LEFT JOIN _categoryoptioncomboname AS cc ON (dv.categoryoptioncomboid = cc.categoryoptioncomboid) " +
             "WHERE dv.followup=true";