dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17047
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6659: (DV) Hibernate mapping issue fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 6659 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-04-20 09:52:29 +0200
message:
(DV) Hibernate mapping issue fixed.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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 2012-04-20 07:38:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2012-04-20 07:51:28 +0000
@@ -283,9 +283,10 @@
executeSql( "ALTER TABLE chart DROP COLUMN domainaxixlabel" );
- executeSql( "UPDATE chart SET userorganisationunit=false WHERE userorganisationunit IS NULL" );
- executeSql( "UPDATE chart SET userorganisationunitchildren=false WHERE userorganisationunitchildren IS NULL" );
- executeSql( "UPDATE chart SET showdata=false WHERE showdata IS NULL" );
+ executeSql( "ALTER TABLE chart ALTER hideLegend DROP NOT NULL" );
+ executeSql( "ALTER TABLE chart ALTER regression DROP NOT NULL" );
+ executeSql( "ALTER TABLE chart ALTER hideSubtitle DROP NOT NULL" );
+ executeSql( "ALTER TABLE chart ALTER userOrganisationUnit DROP NOT NULL" );
// remove outdated relative periods
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2012-04-19 13:58:20 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2012-04-20 07:50:59 +0000
@@ -30,11 +30,11 @@
<property name="filter" />
- <property name="hideLegend" not-null="true" />
-
- <property name="regression" not-null="true" />
-
- <property name="hideSubtitle" not-null="true" />
+ <property name="hideLegend" />
+
+ <property name="regression" />
+
+ <property name="hideSubtitle" />
<property name="targetLineValue" />
@@ -87,11 +87,11 @@
<property name="last5Years" />
</component>
- <property name="userOrganisationUnit" not-null="true" />
+ <property name="userOrganisationUnit" />
- <property name="userOrganisationUnitChildren" not-null="true" />
+ <property name="userOrganisationUnitChildren" />
- <property name="showData" not-null="true" />
+ <property name="showData" />
<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_chart_userid" />