[Aplaws-commit] r942 - in trunk/ccm-ldn-dublin: . sql/ccm-ldn-dublin/upgrade

[<ssk...@vh...>]

Author: sskracic
Date: 2005-09-30 13:21:07 +0200 (Fri, 30 Sep 2005)
New Revision: 942

Modified:
   trunk/ccm-ldn-dublin/application.xml
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
Log:
  SELECT clause confuses the hell out of the upgrade script parser.
Try to execute the upgrade anyway, for Postgres the whole transaction will
be rolled back (yes, Postgres rollbacks even DDL), while for Oracle the
DDL will implicitly commit (or abort, if invalid) the current transaction,
so the whole upgrade script can be rerun afterwards with no ill effects.



Modified: trunk/ccm-ldn-dublin/application.xml
===================================================================
--- trunk/ccm-ldn-dublin/application.xml	2005-09-30 10:47:01 UTC (rev 941)
+++ trunk/ccm-ldn-dublin/application.xml	2005-09-30 11:21:07 UTC (rev 942)
@@ -3,7 +3,7 @@
   name="ccm-ldn-dublin"
   prettyName="Dublin Core"
   version="6.3.0"
-  release="1"
+  release="2"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.3.0"/>

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-30 10:47:01 UTC (rev 941)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2005-09-30 11:21:07 UTC (rev 942)
@@ -1,7 +1,5 @@
-alter table ldn_dublin_core_items
-add ccn_portal_instance varchar2(200);
 -- following query must return 0 rows, otherwise unique index creation will fail
-select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
+-- select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
 --
 -- Deletion of duplicate dublin item mappings involves following tables.
 -- dublin_id entry in following delete statements should be figured out
@@ -14,3 +12,5 @@
 --delete from acs_objects where object_id = 168927;
 --
 @@ ../default/index-ldn_dc_map_item_id_idx.sql
+
+alter table ldn_dublin_core_items add ccn_portal_instance varchar2(200);

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2005-09-30 10:47:01 UTC (rev 941)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2005-09-30 11:21:07 UTC (rev 942)
@@ -1,5 +1,9 @@
-alter table ldn_dublin_core_items
-add ccn_portal_instance varchar(200);
+begin;
+
 -- following query must return 0 rows, otherwise unique index creation will fail
-select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
+-- select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
 \i ../default/index-ldn_dc_map_item_id_idx.sql
+
+alter table ldn_dublin_core_items add ccn_portal_instance varchar(200);
+
+commit;