From f30c6ed7fa00641a484cda25415faf2acbfdbd40 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 2 Aug 2010 09:37:01 +0000 Subject: [PATCH] Merged V3.3-BUG-FIX to HEAD 21530: Merged V3.3 to V3.3-BUG-FIX 21529: Merged PATCHES/V3.3.1 to V3.3 21528: Merged DEV/TEMPORARY to PATCHES/V3.3.1 21500: ALF-4039: Decoding of URI was changed to decoding its elements after tokenization. Now part of URI that contain username is decoded correctly. 21492: ALF-4039: Decoding of URI was added to DownloadContentServlet. Now all parts of URI are decoded correctly. 21496: (RECORD ONLY) Merged V3.3 to PATCHES/V3.3.1 20883: ALF-3604: Fix PersonTest 21486: (RECORD ONLY)Merged V3.3 to V3.3.1 20874: Merged HEAD to V3.3 20873: ALF-3604: Correct case-sensitivity issues in LDAP sync - User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive) - User names are now compared according to Alfresco's case sensitivity setting - Group name comparisions are still case sensitive 21398: (RECORD ONLY) Merged HEAD to PATCHES/V3.3.1 20724: AVMTestSuite - temporarily comment out PurgeTestP - TODO: investigate intermittent test failure 21395: (RECORD ONLY) Incremented version label 21394: (RECORD ONLY) Merged V3.3 to PATCHES/V3.1.1 21389: Add main to run index check against current repository by hand 21390: ALF-4016: Files uploaded to ts are not visible - multi-threaded tracking never abandons an index chunk - warns of long running transaction chunks - logging change 21392: ALF-4016: Files uploaded to ts are not visible - make sure FTS update exceptions can not lead to a TX commit and deletions 21510: Merged PATCHES/V3.2.1 to V3.3 21508: (RECORD ONLY) Incremented version label 21507: ALF-3779, ALF-4148: Correction to batching of node audit properties on upgrade from 2.1 and 2.2 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../upgrade-from-2.1.sql | 27 ++++++++++--------- .../upgrade-from-2.2SP1.sql | 27 ++++++++++--------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql index de91e3c1d8..a4afcdb84a 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql @@ -802,9 +802,10 @@ UPDATE t_alf_node n SET audit_creator = WHERE np.node_id = n.id AND ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'creator' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'creator' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_created = ( @@ -817,9 +818,10 @@ UPDATE t_alf_node n SET audit_created = WHERE np.node_id = n.id AND ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'created' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'created' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_modifier = ( @@ -832,9 +834,10 @@ UPDATE t_alf_node n SET audit_modifier = WHERE np.node_id = n.id AND ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'modifier' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'modifier' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_modified = ( @@ -847,9 +850,9 @@ UPDATE t_alf_node n SET audit_modified = WHERE np.node_id = n.id AND ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'modified' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'modified' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; -- Remove the unused cm:auditable properties -- SHORTCUT: -- The qname_id values can be determined up front diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql index 638c2c6711..d06e52b934 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql @@ -514,9 +514,10 @@ UPDATE t_alf_node n SET audit_creator = WHERE np.node_id = n.id AND ns.uri = 'http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'creator' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'creator' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_created = ( @@ -529,9 +530,10 @@ UPDATE t_alf_node n SET audit_created = WHERE np.node_id = n.id AND ns.uri = 'http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'created' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'created' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_modifier = ( @@ -544,9 +546,10 @@ UPDATE t_alf_node n SET audit_modifier = WHERE np.node_id = n.id AND ns.uri = 'http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'modifier' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'modifier' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; + --FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize UPDATE t_alf_node n SET audit_modified = ( @@ -559,9 +562,9 @@ UPDATE t_alf_node n SET audit_modified = WHERE np.node_id = n.id AND ns.uri = 'http://www.alfresco.org/model/content/1.0' AND - qn.local_name = 'modified' AND - n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND} -); + qn.local_name = 'modified' +) +WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}; -- Remove the unused cm:auditable properties --FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize DELETE t_alf_node_properties