=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java	2013-09-11 16:26:42 +0000
@@ -52,7 +52,7 @@
         dialectMap.put( "org.hibernate.dialect.MySQLDialect", StatementDialect.MYSQL );
         dialectMap.put( "org.hibernate.dialect.PostgreSQLDialect", StatementDialect.POSTGRESQL );
         dialectMap.put( "org.hibernate.dialect.H2Dialect", StatementDialect.H2 );
-        dialectMap.put( "org.hisp.dhis.dialect.H2Dialect", StatementDialect.H2 );
+        dialectMap.put( "org.hibernate.dialect.HSQLDialect", StatementDialect.HSQL );
     }
     
     // -------------------------------------------------------------------------

=== added file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java	2013-09-11 16:26:42 +0000
@@ -0,0 +1,215 @@
+package org.hisp.dhis.jdbc.statementbuilder;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.List;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class HsqlStatementBuilder
+    extends AbstractStatementBuilder
+{    
+    @Override
+    public String getDoubleColumnType()
+    {
+        return "double";
+    }
+    
+    @Override
+    public String getColumnQuote()
+    {
+        return "\"";
+    }
+
+    @Override
+    public String getVacuum( String table )
+    {
+        return null;
+    }
+
+    @Override
+    public String getRegexpMatch()
+    {
+        return "regexp";
+    }
+    
+    @Override
+    public String getDeleteZeroDataValues()
+    {
+        return
+            "DELETE FROM datavalue " +
+            "WHERE datavalue.value = '0'";
+    }
+
+    @Override
+    public String getMoveDataValueToDestination( int sourceId, int destinationId )
+    {
+        return "UPDATE datavalue AS d1 SET sourceid=" + destinationId + " " + "WHERE sourceid=" + sourceId + " "
+            + "AND NOT EXISTS ( " + "SELECT * from datavalue AS d2 " + "WHERE d2.sourceid=" + destinationId + " "
+            + "AND d1.dataelementid=d2.dataelementid " + "AND d1.periodid=d2.periodid "
+            + "AND d1.categoryoptioncomboid=d2.categoryoptioncomboid );";
+    }
+
+    @Override
+    public String getSummarizeDestinationAndSourceWhereMatching( int sourceId, int destId )
+    {
+        return "UPDATE datavalue AS d1 SET value=( " + "SELECT SUM( CAST( value AS "
+            + getDoubleColumnType() + " ) ) " + "FROM datavalue as d2 "
+            + "WHERE d1.dataelementid=d2.dataelementid " + "AND d1.periodid=d2.periodid "
+            + "AND d1.categoryoptioncomboid=d2.categoryoptioncomboid " + "AND d2.sourceid IN ( " + destId + ", "
+            + sourceId + " ) ) " + "FROM dataelement AS de " + "WHERE d1.sourceid=" + destId + " "
+            + "AND d1.dataelementid=de.dataelementid " + "AND de.valuetype='int';";
+    }
+
+    @Override
+    public String getUpdateDestination( int destDataElementId, int destCategoryOptionComboId,
+        int sourceDataElementId, int sourceCategoryOptionComboId )
+    {
+        return "UPDATE datavalue AS d1 SET dataelementid=" + destDataElementId + ", categoryoptioncomboid="
+            + destCategoryOptionComboId + " " + "WHERE dataelementid=" + sourceDataElementId
+            + " and categoryoptioncomboid=" + sourceCategoryOptionComboId + " " + "AND NOT EXISTS ( "
+            + "SELECT * FROM datavalue AS d2 " + "WHERE d2.dataelementid=" + destDataElementId + " "
+            + "AND d2.categoryoptioncomboid=" + destCategoryOptionComboId + " " + "AND d1.periodid=d2.periodid "
+            + "AND d1.sourceid=d2.sourceid );";
+    }
+
+    @Override
+    public String getMoveFromSourceToDestination( int destDataElementId, int destCategoryOptionComboId,
+        int sourceDataElementId, int sourceCategoryOptionComboId )
+    {
+        return "UPDATE datavalue SET value=d2.value,storedby=d2.storedby,lastupdated=d2.lastupdated,comment=d2.comment,followup=d2.followup "
+            + "FROM datavalue AS d2 "
+            + "WHERE datavalue.periodid=d2.periodid "
+            + "AND datavalue.sourceid=d2.sourceid "
+            + "AND datavalue.lastupdated<d2.lastupdated "
+            + "AND datavalue.dataelementid="
+            + destDataElementId
+            + " AND datavalue.categoryoptioncomboid="
+            + destCategoryOptionComboId + " "
+            + "AND d2.dataelementid="
+            + sourceDataElementId + " AND d2.categoryoptioncomboid=" + sourceCategoryOptionComboId + ";";
+    }
+
+    @Override
+    public String getStandardDeviation( int dataElementId, int categoryOptionComboId, int organisationUnitId ){
+        
+        return "SELECT STDDEV( CAST( value AS " + getDoubleColumnType() + " ) ) FROM datavalue " +
+            "WHERE dataelementid='" + dataElementId + "' " +
+            "AND categoryoptioncomboid='" + categoryOptionComboId + "' " +
+            "AND sourceid='" + organisationUnitId + "'";
+    }
+
+    @Override
+    public String getAverage( int dataElementId, int categoryOptionComboId, int organisationUnitId )
+    {    
+         return "SELECT AVG( CAST( value AS " + getDoubleColumnType() + " ) ) FROM datavalue " +
+             "WHERE dataelementid='" + dataElementId + "' " +
+             "AND categoryoptioncomboid='" + categoryOptionComboId + "' " +
+             "AND sourceid='" + organisationUnitId + "'";
+    }
+
+    @Override
+    public String getDeflatedDataValues( int dataElementId, String dataElementName, int categoryOptionComboId,
+                String periodIds, int organisationUnitId, String organisationUnitName, int lowerBound, int upperBound )
+    {   
+        return "SELECT dv.dataelementid, dv.periodid, dv.sourceid, dv.categoryoptioncomboid, dv.value, dv.storedby, dv.lastupdated, " +
+            "dv.comment, dv.followup, '" + lowerBound + "' AS minimumvalue, '" + upperBound + "' AS maximumvalue, " +
+            encode( dataElementName ) + " AS dataelementname, pt.name AS periodtypename, pe.startdate, pe.enddate, " + 
+            encode( organisationUnitName ) + " AS sourcename, cc.categoryoptioncomboname " +
+            "FROM datavalue AS dv " +
+            "JOIN period AS pe USING (periodid) " +
+            "JOIN periodtype AS pt USING (periodtypeid) " +
+            "LEFT JOIN _categoryoptioncomboname AS cc USING (categoryoptioncomboid) " +
+            "WHERE dv.dataelementid='" + dataElementId + "' " +
+            "AND dv.categoryoptioncomboid='" + categoryOptionComboId + "' " +
+            "AND dv.periodid IN (" + periodIds + ") " +
+            "AND dv.sourceid='" + organisationUnitId + "' " +
+            "AND ( CAST( dv.value AS " + getDoubleColumnType() + " ) < '" + lowerBound + "' " +
+            "OR CAST( dv.value AS " + getDoubleColumnType() + " ) > '" + upperBound + "' )";
+    }
+
+    @Override
+    public String limitRecord( int min, int max )
+    {
+        return " LIMIT " + max + " OFFSET " + min;
+    }
+
+    @Override
+    public String getAddDate( String dateField, int days )
+    {
+        return "DATEADD('DAY'," + days + "," + dateField + ")";
+    }
+
+    @Override
+    public String getPatientFullName()
+    {
+        return  "concat( firstname, \" \",middleName , \" \" , lastname)";
+    }
+
+    @Override
+    public String queryDataElementStructureForOrgUnit()
+    {
+        StringBuffer sqlsb = new StringBuffer();
+        
+        sqlsb.append( "(SELECT DISTINCT de.dataelementid, (de.name || ' ' || cc.categoryoptioncomboname) AS DataElement " );
+        sqlsb.append( "FROM dataelement AS de " );
+        sqlsb.append( "INNER JOIN categorycombos_optioncombos cat_opts on de.categorycomboid = cat_opts.categorycomboid ");
+        sqlsb.append( "INNER JOIN _categoryoptioncomboname cc on cat_opts.categoryoptioncomboid = cc.categoryoptioncomboid ");
+        sqlsb.append( "ORDER BY DataElement) " );
+        
+        return sqlsb.toString();
+    }
+
+    @Override
+    public String queryRawDataElementsForOrgUnitBetweenPeriods(Integer orgUnitId, List<Integer> betweenPeriodIds)
+    {
+        StringBuffer sqlsb = new StringBuffer();
+
+        int i = 0;
+        
+        for ( Integer periodId : betweenPeriodIds )
+        {
+            i++;
+
+            sqlsb.append( "SELECT de.dataelementid, (de.name || ' ' || cc.categoryoptioncomboname) AS DataElement, dv.value AS counts_of_aggregated_values, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
+            sqlsb.append( "FROM dataelement AS de " );
+            sqlsb.append( "INNER JOIN datavalue AS dv ON (de.dataelementid = dv.dataelementid) " );
+            sqlsb.append( "INNER JOIN period p ON (dv.periodid = p.periodid) " );
+            sqlsb.append( "INNER JOIN categorycombos_optioncombos cat_opts on de.categorycomboid = cat_opts.categorycomboid ");
+            sqlsb.append( "INNER JOIN _categoryoptioncomboname cc on cat_opts.categoryoptioncomboid = cc.categoryoptioncomboid ");
+            sqlsb.append( "WHERE dv.sourceid = '" + orgUnitId + "' " );
+            sqlsb.append( "AND dv.periodid = '" + periodId + "' " );
+
+            sqlsb.append( i == betweenPeriodIds.size() ? "ORDER BY ColumnHeader,dataelement" : " UNION " );
+        }
+        
+        return sqlsb.toString();
+    }
+}

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java	2013-09-11 16:26:42 +0000
@@ -70,6 +70,10 @@
         {
             this.statementBuilder = new H2StatementBuilder();
         }
+        else if ( statementDialect.equals( StatementDialect.HSQL ) )
+        {
+            this.statementBuilder = new HsqlStatementBuilder();
+        }
         else
         {
             throw new RuntimeException( "Unsupported dialect: " + statementDialect.toString() );