← Back to branch summary

~halvdanhg/dhis2/message-fixes

« back to all changes in this revision

Viewing changes to dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java

  • Committer: Halvdan Hoem Grelland
  • Date: 2015-01-12 12:29:11 UTC
  • mfrom: (17924.2.17 dhis2)
  • Revision ID: halvdanhg@gmail.com-20150112122911-1xg4pwmjblq30cbg
mwt

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java
128
128
    public int deleteDataValueAuditByDataElement( DataElement dataElement )
129
129
    {
130
130
        Query query = sessionFactory.getCurrentSession()
131
 
            .createQuery( "DELETE DataValueAudit WHERE dataElement = :dataElement" )
 
131
            .createQuery( "delete DataValueAudit where dataElement = :dataElement" )
132
132
            .setEntity( "dataElement", dataElement );
133
133
 
134
134
        return query.executeUpdate();
140
140
        Period storedPeriod = periodStore.reloadPeriod( period );
141
141
 
142
142
        Query query = sessionFactory.getCurrentSession()
143
 
            .createQuery( "DELETE DataValueAudit WHERE period = :period" )
 
143
            .createQuery( "delete DataValueAudit where period = :period" )
144
144
            .setEntity( "period", storedPeriod );
145
145
 
146
146
        return query.executeUpdate();
150
150
    public int deleteDataValueAuditByOrganisationUnit( OrganisationUnit organisationUnit )
151
151
    {
152
152
        Query query = sessionFactory.getCurrentSession()
153
 
            .createQuery( "DELETE DataValueAudit WHERE organisationUnit = :organisationUnit" )
 
153
            .createQuery( "delete DataValueAudit where organisationUnit = :organisationUnit" )
154
154
            .setEntity( "organisationUnit", organisationUnit );
155
155
 
156
156
        return query.executeUpdate();
160
160
    public int deleteDataValueAuditByCategoryOptionCombo( DataElementCategoryOptionCombo categoryOptionCombo )
161
161
    {
162
162
        Query query = sessionFactory.getCurrentSession()
163
 
            .createQuery( "DELETE DataValueAudit WHERE categoryOptionCombo = :categoryOptionCombo" )
 
163
            .createQuery( "delete DataValueAudit where categoryOptionCombo = :categoryOptionCombo or attributeOptionCombo = :categoryOptionCombo" )
164
164
            .setEntity( "categoryOptionCombo", categoryOptionCombo );
165
165
 
166
166
        return query.executeUpdate();