Merged V3.2 to HEAD

17403: ETHREEOH-3288: Corrected SQL statement used to obtain the local name from the qname (two locations) in MySQL upgrade.
   17405: ETHREEOH-3255: build 205: unable to upgrade on Oracle.
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17403,17405


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-19 12:51:53 +00:00
parent b865ef7d88
commit 60a9007e8e
9 changed files with 1155 additions and 1105 deletions

View File

@@ -100,7 +100,7 @@ INSERT INTO t_qnames (qname)
-- Extract the namespace and localnames from the QNames
UPDATE t_qnames SET namespace = CONCAT('FILLER-', SUBSTR(SUBSTRING_INDEX(qname, '}', 1), 2));
UPDATE t_qnames SET localname = SUBSTRING_INDEX(qname, '}', -1);
UPDATE t_qnames SET localname = SUBSTRING(qname, INSTR(qname, '}')+1);
-- Move the Namespaces to their new home
INSERT INTO alf_namespace (uri, version)
@@ -172,7 +172,7 @@ UPDATE t_qnames_dyn SET namespace = CONCAT('FILLER-', SUBSTR(SUBSTRING_INDEX(qna
-- Extract the Localname
-- Query OK, 415312 rows affected (16.22 sec)
UPDATE t_qnames_dyn SET local_name = SUBSTRING_INDEX(qname, '}', -1);
UPDATE t_qnames_dyn SET local_name = SUBSTRING(qname, INSTR(qname, '}')+1);
-- Move the namespaces to the their new home
-- Query OK, 4 rows affected (34.59 sec)