LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
jensp 2015-01-06 15:21:33 +00:00
parent ffd5864875
commit d719ddc3e3
8 changed files with 96 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-sci-publications/application.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-sci-publications" name="ccm-sci-publications"
prettyName="OpenCCM Content Types" prettyName="ScientificCMS Publications Module"
version="6.6.7" version="6.6.8"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">
<ccm:dependencies> <ccm:dependencies>

18
ccm-sci-publications/pdl/com/arsdigita/content-types/Publication.pdl
View File

@ -78,15 +78,15 @@ association {
//PublicationGenericOrganizationalUnitsStep for more information //PublicationGenericOrganizationalUnitsStep for more information
association { association {
GenericOrganizationalUnitBundle[0..n] orgaunits = join ct_publication_bundles.bundle_id GenericOrganizationalUnitBundle[0..n] orgaunits = join ct_publication_bundles.bundle_id
to cms_organizationalunits_publications_map.publication_id, to cms_orgaunits_publications_map.publication_id,
join cms_organizationalunits_publications_map.orgaunit_id join cms_orgaunits_publications_map.orgaunit_id
to cms_orgaunit_bundles.bundle_id; to cms_orgaunit_bundles.bundle_id;
PublicationBundle[0..n] publications = join cms_orgaunit_bundles.bundle_id PublicationBundle[0..n] publications = join cms_orgaunit_bundles.bundle_id
to cms_organizationalunits_publications_map.orgaunit_id, to cms_orgaunits_publications_map.orgaunit_id,
join cms_organizationalunits_publications_map.publication_id join cms_orgaunits_publications_map.publication_id
to ct_publication_bundles.bundle_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 //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) select distinct on (ct_publication_bundles.bundle_id)
ct_publication_bundles.bundle_id, ct_publication_bundles.bundle_id,
cms_items.name, cms_items.name,
cms_organizationalunits_publications_map.orgaunit_id cms_orgaunits_publications_map.orgaunit_id
from ct_publication_bundles from ct_publication_bundles
join cms_items on ct_publication_bundles.bundle_id = cms_items.item_id 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 join cms_orgaunits_publications_map on ct_publication_bundles.bundle_id = cms_orgaunits_publications_map.publication_id
where cms_organizationalunits_publications_map.orgaunit_id in :orgaunitIds where cms_orgaunits_publications_map.orgaunit_id in :orgaunitIds
} map { } map {
publicationId = ct_publication_bundles.bundle_id; publicationId = ct_publication_bundles.bundle_id;
orgaunitId = cms_organizationalunits_publications_map.orgaunit_id; orgaunitId = cms_orgaunits_publications_map.orgaunit_id;
name = cms_items.name; name = cms_items.name;
} }
} }

3
ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.7-6.6.8/rename_orga_units.sql 100644
View File

@ -0,0 +1,3 @@
ALTER TABLE cms_organizationalunits_publications_map
RENAME TO cms_orgaunits_publications_map;

8
ccm-sci-publications/sql/ccm-sci-publications/upgrade/postgres-6.6.7-6.6.8.sql 100644
View File

@ -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;

3
ccm-sci-publications/src/ccm-sci-publications.upgrade
View File

@ -21,4 +21,7 @@
<version from="6.6.6" to="6.6.7"> <version from="6.6.6" to="6.6.7">
<script sql="ccm-sci-publications/upgrade/::database::-6.6.6-6.6.7.sql" /> <script sql="ccm-sci-publications/upgrade/::database::-6.6.6-6.6.7.sql" />
</version> </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> </upgrade>

46
ccm-sci-types-department/pdl/com/arsdigita/content-types/SciDepartment.pdl
View File

@ -18,11 +18,11 @@ query getIdsOfContactsOfSciDepartment {
BigDecimal contactId; BigDecimal contactId;
do { do {
select cms_organizationalunits_contact_map.contact_id select cms_orgaunits_contact_map.contact_id
from cms_organizationalunits_contact_map from cms_orgaunits_contact_map
where cms_organizationalunits_contact_map.organizationalunit_id = :department where cms_orgaunits_contact_map.orgaunit_id = :department
} map { } map {
contactId = cms_organizationalunits_contact_map.contact_id; contactId = cms_orgaunits_contact_map.contact_id;
} }
} }
@ -43,11 +43,11 @@ query getIdsOfMembersOfSciDepartment {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :department where cms_orgaunits_person_map.orgaunit_id = :department
} map { } map {
memberId = cms_organizationalunits_person_map.person_id; memberId = cms_orgaunits_person_map.person_id;
} }
} }
@ -55,12 +55,12 @@ query getIdsOfActiveMembersOfSciDepartment {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :department where cms_orgaunits_person_map.orgaunit_id = :department
and cms_organizationalunits_person_map.status = 'active' and cms_orgaunits_person_map.status = 'active'
} map { } map {
memberId = cms_organizationalunits_person_map.person_id; memberId = cms_orgaunits_person_map.person_id;
} }
} }
@ -68,12 +68,12 @@ query getIdsOfAssociatedMembersOfSciDepartment {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :department where cms_orgaunits_person_map.orgaunit_id = :department
and cms_organizationalunits_person_map.status = 'associated' and cms_orgaunits_person_map.status = 'associated'
} map { } map {
memberId = cms_organizationalunits_person_map.personId; memberId = cms_orgaunits_person_map.personId;
} }
} }
@ -81,11 +81,11 @@ query getIdsOfFormerMembersOfSciDepartment {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.cms_persons.person_id select cms_orgaunits_person_map.cms_persons.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :department where cms_orgaunits_person_map.orgaunit_id = :department
and (cms_organizationalunits_person_map.status = 'former' or cms_organizationalunits_person_map.status = 'associatedFormer') and (cms_orgaunits_person_map.status = 'former' or cms_orgaunits_person_map.status = 'associatedFormer')
} map { } map {
memberId = cms_organizationalunits_person_map.personId; memberId = cms_orgaunits_person_map.personId;
} }
} }

46
ccm-sci-types-institute/pdl/com/arsdigita/content-types/SciInstitute.pdl
View File

@ -18,11 +18,11 @@ query getIdsOfContactsOfSciInstitute {
BigDecimal contactId; BigDecimal contactId;
do { do {
select cms_organizationalunits_contact_map.contact_id select cms_orgaunits_contact_map.contact_id
from cms_organizationalunits_contact_map from cms_orgaunits_contact_map
where cms_organizationalunits_contact_map.organizationalunit_id = :institute where cms_orgaunits_contact_map.organizationalunit_id = :institute
} map { } map {
contactId = cms_organizationalunits_contact_map.contact_id; contactId = cms_orgaunits_contact_map.contact_id;
} }
} }
@ -43,11 +43,11 @@ query getIdsOfMembersOfSciInstitute {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :institute where cms_orgaunits_person_map.organizationalunit_id = :institute
} map { } map {
memberId = cms_organizationalunits_person_map.person_id; memberId = cms_orgaunits_person_map.person_id;
} }
} }
@ -55,12 +55,12 @@ query getIdsOfActiveMembersOfSciInstitute {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :institute where cms_orgaunits_person_map.organizationalunit_id = :institute
and cms_organizationalunits_person_map.status = 'active' and cms_orgaunits_person_map.status = 'active'
} map { } map {
memberId = cms_organizationalunits_person_map.person_id; memberId = cms_orgaunits_person_map.person_id;
} }
} }
@ -68,12 +68,12 @@ query getIdsOfAssociatedMembersOfSciInstitute {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.person_id select cms_orgaunits_person_map.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :institute where cms_orgaunits_person_map.organizationalunit_id = :institute
and cms_organizationalunits_person_map.status = 'associated' and cms_orgaunits_person_map.status = 'associated'
} map { } map {
memberId = cms_organizationalunits_person_map.personId; memberId = cms_orgaunits_person_map.personId;
} }
} }
@ -81,11 +81,11 @@ query getIdsOfFormerMembersOfSciInstitute {
BigDecimal memberId; BigDecimal memberId;
do { do {
select cms_organizationalunits_person_map.cms_persons.person_id select cms_orgaunits_person_map.cms_persons.person_id
from cms_organizationalunits_person_map from cms_orgaunits_person_map
where cms_organizationalunits_person_map.organizationalunit_id = :institute where cms_orgaunits_person_map.organizationalunit_id = :institute
and (cms_organizationalunits_person_map.status = 'former' or cms_organizationalunits_person_map.status = 'associatedFormer') and (cms_orgaunits_person_map.status = 'former' or cms_orgaunits_person_map.status = 'associatedFormer')
} map { } map {
memberId = cms_organizationalunits_person_map.personId; memberId = cms_orgaunits_person_map.personId;
} }
} }

10
ccm-sci-types-project/pdl/com/arsdigita/content-types/SciProject.pdl
View File

@ -47,15 +47,15 @@ query getIdsOfProjectsOfOrgaUnit {
select distinct on (ct_sci_project_bundles.bundle_id) select distinct on (ct_sci_project_bundles.bundle_id)
ct_sci_project_bundles.bundle_id, ct_sci_project_bundles.bundle_id,
cms_items.name, cms_items.name,
cms_organizationalunits_hierarchy_map.superior_orgaunit_id cms_orgaunits_hierarchy_map.superior_orgaunit_id
from ct_sci_project_bundles from ct_sci_project_bundles
join cms_items on ct_sci_project_bundles.bundle_id = cms_items.item_id 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 join cms_orgunits_hierarchy_map on ct_sci_project_bundles.bundle_id = cms_orgaunits_hierarchy_map.subordinate_orgaunit_id
where cms_organizationalunits_hierarchy_map.assoc_type = 'ProjectOf' where cms_orgaunits_hierarchy_map.assoc_type = 'ProjectOf'
and cms_organizationalunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds and cms_orgaunits_hierarchy_map.superior_orgaunit_id in :orgaunitIds
} map { } map {
projectId = ct_sci_project_bundles.bundle_id; 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; name = cms_items.name;
} }
} }