From d719ddc3e3fd7ec1fde69b109b05e886e643f4de Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 6 Jan 2015 15:21:33 +0000
Subject: [PATCH] Upgrades for sci modules due to renaming of table
 cms_organizationalunits to cms_orgaunits

git-svn-id: https://svn.libreccm.org/ccm/trunk@3070 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-sci-publications/application.xml          | 44 +++++++++---------
 .../arsdigita/content-types/Publication.pdl   | 18 ++++----
 .../upgrade/6.6.7-6.6.8/rename_orga_units.sql |  3 ++
 .../upgrade/postgres-6.6.7-6.6.8.sql          |  8 ++++
 .../src/ccm-sci-publications.upgrade          |  3 ++
 .../arsdigita/content-types/SciDepartment.pdl | 46 +++++++++----------
 .../arsdigita/content-types/SciInstitute.pdl  | 46 +++++++++----------
 .../arsdigita/content-types/SciProject.pdl    | 10 ++--
 8 files changed, 96 insertions(+), 82 deletions(-)
 create mode 100644 ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.7-6.6.8/rename_orga_units.sql
 create mode 100644 ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.7-6.6.8.sql

diff --git a/ccm-sci-publications/application.xml b/ccm-sci-publications/application.xml
index ce166cb3a..bb5f93e1a 100644
--- a/ccm-sci-publications/application.xml
+++ b/ccm-sci-publications/application.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-sci-publications"
-  prettyName="OpenCCM Content Types"
-  version="6.6.7"
-  release="1"
-  webapp="ROOT">
-  <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.6.4" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.6.10" relation="ge"/>
-  </ccm:dependencies>
-  <ccm:directories>
-    <ccm:directory name="pdl"/>
-    <ccm:directory name="sql"/>
-    <ccm:directory name="lib"/>
-    <ccm:directory name="src"/>
-  </ccm:directories>
-  <ccm:contacts>
-    <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
-    <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
-  </ccm:contacts>
-  <ccm:description>
-    Content types and applications for publications.
-  </ccm:description>
+                 name="ccm-sci-publications"
+                 prettyName="ScientificCMS Publications Module"
+                 version="6.6.8"
+                 release="1"
+                 webapp="ROOT">
+    <ccm:dependencies>
+        <ccm:requires name="ccm-core" version="6.6.4" relation="ge"/>
+        <ccm:requires name="ccm-cms" version="6.6.10" relation="ge"/>
+    </ccm:dependencies>
+    <ccm:directories>
+        <ccm:directory name="pdl"/>
+        <ccm:directory name="sql"/>
+        <ccm:directory name="lib"/>
+        <ccm:directory name="src"/>
+    </ccm:directories>
+    <ccm:contacts>
+        <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
+        <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
+    </ccm:contacts>
+    <ccm:description>
+        Content types and applications for publications.
+    </ccm:description>
 </ccm:application>
diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
index 289fc619b..3ebcb8625 100644
--- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
+++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
@@ -78,15 +78,15 @@ association {
 //PublicationGenericOrganizationalUnitsStep for more information
 association {
     GenericOrganizationalUnitBundle[0..n] orgaunits = join ct_publication_bundles.bundle_id
-                                                        to cms_organizationalunits_publications_map.publication_id,
-                                                      join cms_organizationalunits_publications_map.orgaunit_id
+                                                        to cms_orgaunits_publications_map.publication_id,
+                                                      join cms_orgaunits_publications_map.orgaunit_id
                                                         to cms_orgaunit_bundles.bundle_id;
 
     PublicationBundle[0..n] publications = join cms_orgaunit_bundles.bundle_id
-                                       to cms_organizationalunits_publications_map.orgaunit_id,
-                                     join cms_organizationalunits_publications_map.publication_id
+                                       to cms_orgaunits_publications_map.orgaunit_id,
+                                     join cms_orgaunits_publications_map.publication_id
                                        to ct_publication_bundles.bundle_id;
-    Integer[0..1] publicationOrder = cms_organizationalunits_publications_map.publication_order INTEGER;
+    Integer[0..1] publicationOrder = cms_orgaunits_publications_map.publication_order INTEGER;
 }
 
 //Retrieves the publications of an organizational unit (the ids). Allows filtering for a orgaunit id 
@@ -101,14 +101,14 @@ query getIdsOfPublicationsForOrgaUnit {
         select distinct on (ct_publication_bundles.bundle_id) 
             ct_publication_bundles.bundle_id,                                                                                               
             cms_items.name,
-            cms_organizationalunits_publications_map.orgaunit_id            
+            cms_orgaunits_publications_map.orgaunit_id            
         from ct_publication_bundles
         join cms_items on ct_publication_bundles.bundle_id = cms_items.item_id
-        join cms_organizationalunits_publications_map on ct_publication_bundles.bundle_id = cms_organizationalunits_publications_map.publication_id        
-        where cms_organizationalunits_publications_map.orgaunit_id in :orgaunitIds
+        join cms_orgaunits_publications_map on ct_publication_bundles.bundle_id = cms_orgaunits_publications_map.publication_id        
+        where cms_orgaunits_publications_map.orgaunit_id in :orgaunitIds
     } map {
         publicationId = ct_publication_bundles.bundle_id;        
-        orgaunitId = cms_organizationalunits_publications_map.orgaunit_id;
+        orgaunitId = cms_orgaunits_publications_map.orgaunit_id;
         name = cms_items.name;
     }
 }
diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.7-6.6.8/rename_orga_units.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.7-6.6.8/rename_orga_units.sql
new file mode 100644
index 000000000..fe27bc073
--- /dev/null
+++ b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.7-6.6.8/rename_orga_units.sql
@@ -0,0 +1,3 @@
+ALTER TABLE cms_organizationalunits_publications_map 
+    RENAME TO cms_orgaunits_publications_map;
+
diff --git a/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.7-6.6.8.sql b/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.7-6.6.8.sql
new file mode 100644
index 000000000..cf208f74c
--- /dev/null
+++ b/ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.7-6.6.8.sql
@@ -0,0 +1,8 @@
+\echo 'ScientificCMS Publications module 6.6.6 -> 6.6.7 Upgrade script (PostgreSQL)'
+
+begin;
+
+\i ../default/upgrade/6.6.7-6.6.8/rename_orga_units.sql
+
+end;
+
diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade
index 1bd6ab285..34b72e8ed 100644
--- a/ccm-sci-publications/src/ccm-sci-publications.upgrade
+++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade
@@ -21,4 +21,7 @@
     <version from="6.6.6" to="6.6.7">
         <script sql="ccm-sci-publications/upgrade/::database::-6.6.6-6.6.7.sql" />
     </version>
+    <version from="6.6.7" to="6.6.8">
+        <script sql="ccm-sci-publications/upgrade/::database::-6.6.7-6.6.8.sql" />
+    </version>
 </upgrade>
\ No newline at end of file
diff --git a/ccm-sci-types-department/pdl/com/arsdigita/content-types/SciDepartment.pdl b/ccm-sci-types-department/pdl/com/arsdigita/content-types/SciDepartment.pdl
index 98016890b..431186ba4 100644
--- a/ccm-sci-types-department/pdl/com/arsdigita/content-types/SciDepartment.pdl
+++ b/ccm-sci-types-department/pdl/com/arsdigita/content-types/SciDepartment.pdl
@@ -18,11 +18,11 @@ query getIdsOfContactsOfSciDepartment {
     BigDecimal contactId;
 
     do {
-        select cms_organizationalunits_contact_map.contact_id 
-        from cms_organizationalunits_contact_map        
-        where cms_organizationalunits_contact_map.organizationalunit_id = :department        
+        select cms_orgaunits_contact_map.contact_id 
+        from cms_orgaunits_contact_map        
+        where cms_orgaunits_contact_map.orgaunit_id = :department        
     } map {
-        contactId = cms_organizationalunits_contact_map.contact_id;
+        contactId = cms_orgaunits_contact_map.contact_id;
     }
 }
 
@@ -43,11 +43,11 @@ query getIdsOfMembersOfSciDepartment {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map      
-        where cms_organizationalunits_person_map.organizationalunit_id = :department
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map      
+        where cms_orgaunits_person_map.orgaunit_id = :department
     } map {
-        memberId = cms_organizationalunits_person_map.person_id;
+        memberId = cms_orgaunits_person_map.person_id;
     }
 }
 
@@ -55,12 +55,12 @@ query getIdsOfActiveMembersOfSciDepartment {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map        
-        where cms_organizationalunits_person_map.organizationalunit_id = :department 
-        and cms_organizationalunits_person_map.status = 'active'
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map        
+        where cms_orgaunits_person_map.orgaunit_id = :department 
+        and cms_orgaunits_person_map.status = 'active'
     } map {
-        memberId = cms_organizationalunits_person_map.person_id;
+        memberId = cms_orgaunits_person_map.person_id;
     }
 }
 
@@ -68,12 +68,12 @@ query getIdsOfAssociatedMembersOfSciDepartment {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map       
-        where cms_organizationalunits_person_map.organizationalunit_id = :department 
-        and cms_organizationalunits_person_map.status = 'associated'
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map       
+        where cms_orgaunits_person_map.orgaunit_id = :department 
+        and cms_orgaunits_person_map.status = 'associated'
     } map {
-        memberId = cms_organizationalunits_person_map.personId;
+        memberId = cms_orgaunits_person_map.personId;
     }
 }
 
@@ -81,11 +81,11 @@ query getIdsOfFormerMembersOfSciDepartment {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.cms_persons.person_id
-        from cms_organizationalunits_person_map   
-        where cms_organizationalunits_person_map.organizationalunit_id = :department 
-        and (cms_organizationalunits_person_map.status = 'former' or cms_organizationalunits_person_map.status = 'associatedFormer')
+        select cms_orgaunits_person_map.cms_persons.person_id
+        from cms_orgaunits_person_map   
+        where cms_orgaunits_person_map.orgaunit_id = :department 
+        and (cms_orgaunits_person_map.status = 'former' or cms_orgaunits_person_map.status = 'associatedFormer')
     } map {
-        memberId = cms_organizationalunits_person_map.personId;
+        memberId = cms_orgaunits_person_map.personId;
     }
 }
\ No newline at end of file
diff --git a/ccm-sci-types-institute/pdl/com/arsdigita/content-types/SciInstitute.pdl b/ccm-sci-types-institute/pdl/com/arsdigita/content-types/SciInstitute.pdl
index 391b20a34..0afcceb0c 100644
--- a/ccm-sci-types-institute/pdl/com/arsdigita/content-types/SciInstitute.pdl
+++ b/ccm-sci-types-institute/pdl/com/arsdigita/content-types/SciInstitute.pdl
@@ -18,11 +18,11 @@ query getIdsOfContactsOfSciInstitute {
     BigDecimal contactId;
 
     do {
-        select cms_organizationalunits_contact_map.contact_id 
-        from cms_organizationalunits_contact_map        
-        where cms_organizationalunits_contact_map.organizationalunit_id = :institute        
+        select cms_orgaunits_contact_map.contact_id 
+        from cms_orgaunits_contact_map        
+        where cms_orgaunits_contact_map.organizationalunit_id = :institute        
     } map {
-        contactId = cms_organizationalunits_contact_map.contact_id;
+        contactId = cms_orgaunits_contact_map.contact_id;
     }
 }
 
@@ -43,11 +43,11 @@ query getIdsOfMembersOfSciInstitute {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map      
-        where cms_organizationalunits_person_map.organizationalunit_id = :institute
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map      
+        where cms_orgaunits_person_map.organizationalunit_id = :institute
     } map {
-        memberId = cms_organizationalunits_person_map.person_id;
+        memberId = cms_orgaunits_person_map.person_id;
     }
 }
 
@@ -55,12 +55,12 @@ query getIdsOfActiveMembersOfSciInstitute {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map        
-        where cms_organizationalunits_person_map.organizationalunit_id = :institute 
-        and cms_organizationalunits_person_map.status = 'active'
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map        
+        where cms_orgaunits_person_map.organizationalunit_id = :institute 
+        and cms_orgaunits_person_map.status = 'active'
     } map {
-        memberId = cms_organizationalunits_person_map.person_id;
+        memberId = cms_orgaunits_person_map.person_id;
     }
 }
 
@@ -68,12 +68,12 @@ query getIdsOfAssociatedMembersOfSciInstitute {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.person_id
-        from cms_organizationalunits_person_map       
-        where cms_organizationalunits_person_map.organizationalunit_id = :institute 
-        and cms_organizationalunits_person_map.status = 'associated'
+        select cms_orgaunits_person_map.person_id
+        from cms_orgaunits_person_map       
+        where cms_orgaunits_person_map.organizationalunit_id = :institute 
+        and cms_orgaunits_person_map.status = 'associated'
     } map {
-        memberId = cms_organizationalunits_person_map.personId;
+        memberId = cms_orgaunits_person_map.personId;
     }
 }
 
@@ -81,11 +81,11 @@ query getIdsOfFormerMembersOfSciInstitute {
     BigDecimal memberId;
 
     do {
-        select cms_organizationalunits_person_map.cms_persons.person_id
-        from cms_organizationalunits_person_map   
-        where cms_organizationalunits_person_map.organizationalunit_id = :institute 
-        and (cms_organizationalunits_person_map.status = 'former' or cms_organizationalunits_person_map.status = 'associatedFormer')
+        select cms_orgaunits_person_map.cms_persons.person_id
+        from cms_orgaunits_person_map   
+        where cms_orgaunits_person_map.organizationalunit_id = :institute 
+        and (cms_orgaunits_person_map.status = 'former' or cms_orgaunits_person_map.status = 'associatedFormer')
     } map {
-        memberId = cms_organizationalunits_person_map.personId;
+        memberId = cms_orgaunits_person_map.personId;
     }
 }
\ No newline at end of file
diff --git a/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl b/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
index bc6856e46..17a7d0bb3 100644
--- a/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
+++ b/ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
@@ -47,15 +47,15 @@ query getIdsOfProjectsOfOrgaUnit {
         select distinct on (ct_sci_project_bundles.bundle_id) 
             ct_sci_project_bundles.bundle_id, 
             cms_items.name,
-            cms_organizationalunits_hierarchy_map.superior_orgaunit_id
+            cms_orgaunits_hierarchy_map.superior_orgaunit_id
         from ct_sci_project_bundles
         join cms_items on ct_sci_project_bundles.bundle_id = cms_items.item_id
-        join cms_organizationalunits_hierarchy_map on ct_sci_project_bundles.bundle_id = cms_organizationalunits_hierarchy_map.subordinate_orgaunit_id
-        where cms_organizationalunits_hierarchy_map.assoc_type = 'ProjectOf'
-        and cms_organizationalunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds
+        join cms_orgunits_hierarchy_map on ct_sci_project_bundles.bundle_id = cms_orgaunits_hierarchy_map.subordinate_orgaunit_id
+        where cms_orgaunits_hierarchy_map.assoc_type = 'ProjectOf'
+        and cms_orgaunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds
     } map {
         projectId = ct_sci_project_bundles.bundle_id;
-        orgaunitId = cms_organizationalunits_hierarchy_map.superior_orgaunit_id;
+        orgaunitId = cms_orgaunits_hierarchy_map.superior_orgaunit_id;
         name = cms_items.name;
     }
 }