=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/AbstractStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/AbstractStatementBuilder.java	2016-01-15 20:48:20 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/AbstractStatementBuilder.java	2016-05-17 06:21:21 +0000
@@ -40,8 +40,8 @@
 public abstract class AbstractStatementBuilder
     implements StatementBuilder
 {
-    static final String AZaz = "'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'";
-    static final String AZaz09 = "'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'";
+    static final String AZaz = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    static final String AZaz09 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
     @Override
     public String encode( String value )

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java	2016-05-17 06:21:21 +0000
@@ -87,7 +87,7 @@
     @Override
     public String getCharAt( String str, String n )
     {
-        return "substring(" + str + "," + n + ",1)";
+        return "substring('" + str + "'," + n + ",1)";
     }
 
     @Override

=== modified 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	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java	2016-05-17 06:21:21 +0000
@@ -87,7 +87,7 @@
     @Override
     public String getCharAt( String str, String n )
     {
-        return "substring(" + str + "," + n + ",1)";
+        return "substring('" + str + "'," + n + ",1)";
     }
 
     @Override

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java	2016-05-17 06:21:21 +0000
@@ -93,7 +93,7 @@
     @Override
     public String getCharAt( String str, String n )
     {
-        return "substring(" + str + "," + n + ",1)";
+        return "substring('" + str + "'," + n + ",1)";
     }
 
     @Override

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java	2016-05-17 06:21:21 +0000
@@ -111,7 +111,7 @@
     @Override
     public String getCharAt( String str, String n )
     {
-        return "substring(" + str + " from " + n + " for 1)";
+        return "substring('" + str + "' from " + n + " for 1)";
     }
 
     @Override