=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2013-12-09 21:32:59 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java 2013-12-16 10:32:17 +0000 @@ -191,7 +191,8 @@ public Map> getOrganisationUnitDataSetAssocationMap() { final String sql = "select ds.uid as ds_uid, ou.uid as ou_uid from datasetsource d " + - "left join organisationunit ou on ou.organisationunitid=d.sourceid left join dataset ds on ds.datasetid=d.datasetid"; + "left join organisationunit ou on ou.organisationunitid=d.sourceid " + + "left join dataset ds on ds.datasetid=d.datasetid"; final Map> map = new HashMap>(); @@ -220,10 +221,10 @@ @Override public Map> getOrganisationUnitGroupDataSetAssocationMap() { - final String sql = "select ds.uid as ds_uid, ou.uid as ou_uid from orgunitgroupdatasets ougds\n" + - "\tleft join orgunitgroupmembers ougm on ougds.orgunitgroupid=ougm.orgunitgroupid\n" + - "\tleft join organisationunit ou on ou.organisationunitid=ougm.organisationunitid\n" + - "\tleft join dataset ds on ds.datasetid=ougds.datasetid;\n"; + final String sql = "select ds.uid as ds_uid, ou.uid as ou_uid from orgunitgroupdatasets ougds " + + "left join orgunitgroupmembers ougm on ougds.orgunitgroupid=ougm.orgunitgroupid " + + "left join organisationunit ou on ou.organisationunitid=ougm.organisationunitid " + + "left join dataset ds on ds.datasetid=ougds.datasetid"; final Map> map = new HashMap>(); @@ -313,7 +314,6 @@ ).list(); } - // ------------------------------------------------------------------------- // OrganisationUnitHierarchy // -------------------------------------------------------------------------