=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/QueryServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/QueryServiceTest.java	2015-06-04 01:55:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/QueryServiceTest.java	2015-06-04 05:16:55 +0000
@@ -525,6 +525,22 @@
     }
 
     @Test
+    public void testNumberTypeBoolOrInt()
+    {
+        createDataElements();
+        Query query = Query.from( schemaService.getDynamicSchema( DataElement.class ) );
+
+        Disjunction disjunction = query.disjunction();
+        disjunction.add( Restrictions.eq( "numberType", DataElement.VALUE_TYPE_BOOL ) );
+        disjunction.add( Restrictions.eq( "numberType", DataElement.VALUE_TYPE_INT ) );
+        query.add( disjunction );
+
+        Result result = queryService.query( query );
+
+        assertEquals( 4, result.size() );
+    }
+
+    @Test
     public void testDoubleEqDisjunction()
     {
         createDataElements();
@@ -549,6 +565,24 @@
         createDataElements();
         Query query = Query.from( schemaService.getDynamicSchema( DataElement.class ) );
 
+        query.add( Restrictions.ge( "created", Year.parseYear( "2002" ).getStart() ) );
+        query.add( Restrictions.le( "created", Year.parseYear( "2004" ).getStart() ) );
+
+        Result result = queryService.query( query );
+
+        assertEquals( 3, result.size() );
+
+        assertTrue( collectionContainsUid( result.getItems(), "deabcdefghB" ) );
+        assertTrue( collectionContainsUid( result.getItems(), "deabcdefghC" ) );
+        assertTrue( collectionContainsUid( result.getItems(), "deabcdefghD" ) );
+    }
+
+    @Test
+    public void testDateRangeWithConjunction()
+    {
+        createDataElements();
+        Query query = Query.from( schemaService.getDynamicSchema( DataElement.class ) );
+
         Conjunction conjunction = query.conjunction();
         conjunction.add( Restrictions.ge( "created", Year.parseYear( "2002" ).getStart() ) );
         conjunction.add( Restrictions.le( "created", Year.parseYear( "2004" ).getStart() ) );