=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-04-04 14:30:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-04-19 10:20:01 +0000
@@ -558,6 +558,8 @@
         executeSql( "UPDATE chart SET publicaccess='--------' WHERE user IS NULL AND publicaccess IS NULL;" );
         executeSql( "UPDATE map SET publicaccess='-------' WHERE user IS NULL AND publicaccess IS NULL;" );
 
+        executeSql( "ALTER TABLE dataelement ALTER COLUMN domaintype SET NOT NULL" );
+        
         log.info( "Tables updated" );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2013-04-06 16:42:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml	2013-04-19 10:20:01 +0000
@@ -31,7 +31,7 @@
 
     <property name="textType" column="textType" length="16" />
 
-    <property name="domainType" column="domaintype" length="16" />
+    <property name="domainType" not-null="true" column="domaintype" length="16" />
 
     <property name="aggregationOperator" not-null="true" column="aggregationtype" length="16" />