Merged V3.0 to HEAD

12827: Merged V2.2 to V3.0
      12822: Fixed ALFCOM-2372: Upgrade from 2.1C fails

   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12827
      Merged /alfresco/BRANCHES/V2.2:r12822


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-01-16 14:27:41 +00:00
parent e4dae16f8c
commit 36a62cab43
2 changed files with 8 additions and 16 deletions

View File

@@ -10,21 +10,17 @@
-- from the AVM nodes.
-- PostgreSQL requires TRUE for boolean values.
DELETE FROM avm_aspects
WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}submitted';
DELETE FROM avm_aspects_new WHERE EXISTS
DELETE FROM avm_aspects WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'submitted' AND q.id = avm_aspects_new.qname_id
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'submitted' AND q.id = avm_aspects.qname_id
);
DELETE FROM avm_node_properties
WHERE qname = '{http://www.alfresco.org/model/wcmworkflow/1.0}workflowInstanceId';
DELETE FROM avm_node_properties_new WHERE EXISTS
DELETE FROM avm_node_properties WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'workflowInstanceId' AND q.id = avm_node_properties_new.qname_id
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'workflowInstanceId' AND q.id = avm_node_properties.qname_id
);
--