From 36a62cab438fc426e854a3db27577c59ad97269f Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 16 Jan 2009 14:27:41 +0000 Subject: [PATCH] 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 --- ...escoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql | 12 ++++-------- ...escoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql index 35af5e0810..9e4f092f55 100644 --- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql +++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql @@ -9,21 +9,17 @@ -- This removes the wcmwf:submitted aspect along with the wcmwf:workflowInstanceId property -- from the AVM nodes -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 ); -- diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql index 0dae068937..41dbe41efe 100644 --- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql +++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.1-RemoveWcmSubmittedAspect.sql @@ -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 ); --