dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1931
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Wed 2010-08-18 12:41:10 +0200
message:
  Prefixed all resource tables wich not already were prefixed with _ (underscore). Will make it easier to see which tables are resource tables and which are system tables when working with the database/views.
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/DataElementCategoryOptionComboName.hbm.xml
  dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/GroupSetStructure.hbm.xml
  dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/OrganisationUnitStructure.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetStructureBatchHandler.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitStructureBatchHandler.java


--
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-administration/src/main/resources/org/hisp/dhis/resourcetable/DataElementCategoryOptionComboName.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/DataElementCategoryOptionComboName.hbm.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/DataElementCategoryOptionComboName.hbm.xml	2010-08-18 10:41:10 +0000
@@ -4,7 +4,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.resourcetable.DataElementCategoryOptionComboName" table="categoryoptioncomboname">
+  <class name="org.hisp.dhis.resourcetable.DataElementCategoryOptionComboName" table="_categoryoptioncomboname">
     <id name="id" column="id">
       <generator class="native"/>
     </id>

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/GroupSetStructure.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/GroupSetStructure.hbm.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/GroupSetStructure.hbm.xml	2010-08-18 10:41:10 +0000
@@ -4,7 +4,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.resourcetable.GroupSetStructure" table="orgunitgroupsetstructure">
+  <class name="org.hisp.dhis.resourcetable.GroupSetStructure" table="_orgunitgroupsetstructure">
     <id name="id" column="orgunitgroupsetstructureid">
       <generator class="native"/>
     </id>

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/OrganisationUnitStructure.hbm.xml'
--- dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/OrganisationUnitStructure.hbm.xml	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/resourcetable/OrganisationUnitStructure.hbm.xml	2010-08-18 10:41:10 +0000
@@ -4,7 +4,7 @@
   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";>
 
 <hibernate-mapping>
-  <class name="org.hisp.dhis.resourcetable.OrganisationUnitStructure" table="orgunitstructure">
+  <class name="org.hisp.dhis.resourcetable.OrganisationUnitStructure" table="_orgunitstructure">
     <id name="id" column="orgunitstructureid">
       <generator class="native"/>
     </id>

=== 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	2010-07-30 14:13:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2010-08-18 10:41:10 +0000
@@ -68,6 +68,9 @@
     @Transactional
     public void execute()
     {
+        executeSql( "drop table categoryoptioncomboname" );
+        executeSql( "drop table orgunitgroupsetstructure" );
+        executeSql( "drop table orgunitstructure" );
         executeSql( "drop table orgunithierarchystructure" );
         executeSql( "drop table orgunithierarchy" );
         executeSql( "drop table datavalueaudit" );

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetStructureBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetStructureBatchHandler.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetStructureBatchHandler.java	2010-08-18 10:41:10 +0000
@@ -53,7 +53,7 @@
 
     protected void setTableName()
     {
-        statementBuilder.setTableName( "orgunitgroupsetstructure" );
+        statementBuilder.setTableName( "_orgunitgroupsetstructure" );
     }
     
     @Override

=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitStructureBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitStructureBatchHandler.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitStructureBatchHandler.java	2010-08-18 10:41:10 +0000
@@ -52,7 +52,7 @@
 
     protected void setTableName()
     {
-        statementBuilder.setTableName( "orgunitstructure" );
+        statementBuilder.setTableName( "_orgunitstructure" );
     }
     
     @Override