From 7cc3aa9fc84c2338feea2cb7acb13ade7d6045ae Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Fri, 10 Apr 2015 21:09:22 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 101652: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 101405: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 101285: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5) 101221: MNT-13688: propTablesCleanupTrigger script fails to execute against database when server has been upgraded from a 4.0.2 instance that had Auditing Enabled for CmisChangeLog - Fixed the CleanAlfPropTables.sql script to support non-unique values. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../CleanAlfPropTables.sql | 9 ++++++--- .../CleanAlfPropTables.sql | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/config/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql b/config/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql index bbfb1b4b5b..f59add0c2c 100644 --- a/config/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql +++ b/config/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql @@ -110,7 +110,8 @@ delete apv from alf_prop_value apv inner join temp_prop_val_obs tpva on apv.id = -- find and clear obsoleted string values -- find the strings already deleted -insert into temp_del_str1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type in (3, 5, 6); +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_str1 select distinct distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type in (3, 5, 6) and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_str1.id system.upgrade.clean_alf_prop_tables.batchsize delete aps from alf_prop_string_value aps inner join temp_del_str1 tds on aps.id = tds.id and tds.id >= ${LOWERBOUND} and tds.id <= ${UPPERBOUND}; @@ -123,7 +124,8 @@ delete aps from alf_prop_string_value aps inner join temp_del_str1 tds on aps.id -- find and clear obsoleted serialized values -- find the serialized values already deleted -insert into temp_del_ser1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 4; +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_ser1 select distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 4 and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_ser1.id system.upgrade.clean_alf_prop_tables.batchsize delete aps from alf_prop_serializable_value aps inner join temp_del_ser1 tds on aps.id = tds.id and tds.id >= ${LOWERBOUND} and tds.id <= ${UPPERBOUND}; @@ -135,7 +137,8 @@ delete aps from alf_prop_serializable_value aps inner join temp_del_ser1 tds on -- find and clear obsoleted double values -- find the double values already deleted -insert into temp_del_double1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 2; +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_double1 select distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 2 and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_double1.id system.upgrade.clean_alf_prop_tables.batchsize delete apd from alf_prop_double_value apd inner join temp_del_double1 tdd on apd.id = tdd.id and tdd.id >= ${LOWERBOUND} and tdd.id <= ${UPPERBOUND}; diff --git a/config/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql b/config/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql index 6221967eb9..cfd8a5e263 100644 --- a/config/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql +++ b/config/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql @@ -111,7 +111,8 @@ delete from alf_prop_value apv using temp_prop_val_obs tpva where apv.id = tpva. -- find and clear obsoleted string values -- find the strings already deleted -insert into temp_del_str1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type in (3, 5, 6); +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_str1 select distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type in (3, 5, 6) and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_str1.id system.upgrade.clean_alf_prop_tables.batchsize delete from alf_prop_string_value aps using temp_del_str1 tds where aps.id = tds.id and tds.id >= ${LOWERBOUND} and tds.id <= ${UPPERBOUND}; @@ -124,7 +125,8 @@ delete from alf_prop_string_value aps using temp_del_str1 tds where aps.id = tds -- find and clear obsoleted serialized values -- find the serialized values already deleted -insert into temp_del_ser1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 4; +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_ser1 select distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 4 and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_ser1.id system.upgrade.clean_alf_prop_tables.batchsize delete from alf_prop_serializable_value aps using temp_del_ser1 tds where aps.id = tds.id and tds.id >= ${LOWERBOUND} and tds.id <= ${UPPERBOUND}; @@ -136,7 +138,8 @@ delete from alf_prop_serializable_value aps using temp_del_ser1 tds where aps.id -- find and clear obsoleted double values -- find the double values already deleted -insert into temp_del_double1 select pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 2; +--FOREACH temp_prop_val_obs.id system.upgrade.clean_alf_prop_tables.batchsize +insert into temp_del_double1 select distinct pva.long_value from temp_prop_val_obs pva where pva.persisted_type = 2 and pva.id >= ${LOWERBOUND} and pva.id <= ${UPPERBOUND}; --FOREACH temp_del_double1.id system.upgrade.clean_alf_prop_tables.batchsize delete from alf_prop_double_value apd using temp_del_double1 tdd where apd.id = tdd.id and tdd.id >= ${LOWERBOUND} and tdd.id <= ${UPPERBOUND};