dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5588
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-12-25 17:41:27 +0100
message:
  Removed chart name uniqueness constraint. Now that we have system/user charts it is not relevant.
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	2011-12-22 17:28:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2011-12-25 16:41:27 +0000
@@ -266,6 +266,8 @@
         executeSql( "ALTER TABLE chart DROP COLUMN last6BiMonths" );
         
         executeSql( "DROP TABLE chart_periods" );
+        executeSql( "ALTER TABLE chart DROP CONSTRAINT chart_title_key" );
+        executeSql( "ALTER TABLE chart DROP CONSTRAINT chart_name_key" );
         
         // 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	2011-12-22 19:16:02 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml	2011-12-25 16:41:27 +0000
@@ -13,7 +13,10 @@
     <id name="id" column="chartid">
       <generator class="native" />
     </id>
-    &identifiableProperties;
+
+    <property name="name" column="name" not-null="true" length="230" />
+    <property name="uid" column="uid" length="11" />
+    <property name="lastUpdated" type="timestamp"/>
 
     <property name="domainAxisLabel" />