From 3c7f2061aeaf4d1fc5f1027eed35d3ed508664bf Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 13 Dec 2014 10:08:40 +0000 Subject: [PATCH] Adapated upgrade ccm-core-6.6.4-6.6.5 for Oracle syntax git-svn-id: https://svn.libreccm.org/ccm/trunk@3046 8810af33-2d31-482b-a856-94f89814c4df --- .../ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql | 16 +--------------- .../6.6.4-6.6.5/remove_old_style_app_tables.sql | 0 .../ccm-core/upgrade/postgres-6.6.4-6.6.5.sql | 2 +- .../6.6.4-6.6.5/remove_old_style_app_tables.sql} | 6 +++++- 4 files changed, 7 insertions(+), 17 deletions(-) rename ccm-core/sql/ccm-core/upgrade/{default => oracle-se}/6.6.4-6.6.5/remove_old_style_app_tables.sql (100%) rename ccm-core/sql/ccm-core/upgrade/{default/6.6.4-6.6.5/remove_sitemap_app_table.sql => postgres/6.6.4-6.6.5/remove_old_style_app_tables.sql} (86%) diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql index 7f8bcdea6..fe8e0392e 100644 --- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql +++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql @@ -22,7 +22,7 @@ PROMPT Red Hat Enterprise CORE 6.6.4 -> 6.6.5 Upgrade Script (Oracle) -- -- Remove old style application tables, must be the first script executed. -@@ default/6.6.4-6.6.5/remove_old_style_app_tables.sql +@@ oracle-se/6.6.4-6.6.5/remove_old_style_app_tables.sql -- Adjust table cat_object_root_category_map -- (Constraint cat_obj_package_id_fk already removed in step 1) @@ -36,17 +36,3 @@ PROMPT Red Hat Enterprise CORE 6.6.4 -> 6.6.5 Upgrade Script (Oracle) -- (Constraint applica_typ_pac_typ_id_f_v80ma already removed in step 1) @@ default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes_table.sql --- Remove bebop entries in apm_package* which are not used anymore. ---@@ default/6.6.3-6.6.4/remove_bebop_legacy_entries.sql - --- Remove DS entries in apm_package* which are not used anymore. ---@@ default/6.6.3-6.6.4/remove_ds_legacy_entries.sql - --- Remove sitemap entries in apm_package* which are not used anymore. ---@@ default/6.6.3-6.6.4/remove_sitemap_legacy_entries.sql - --- Remove admin entries in apm_package* which are not used anymore. ---@@ default/6.6.3-6.6.4/remove_admin_legacy_entries.sql - --- Remove permissions entries in apm_package* which are not used anymore. ---@@ default/6.6.3-6.6.4/remove_permissions_legacy_entries.sql diff --git a/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_style_app_tables.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.4-6.6.5/remove_old_style_app_tables.sql similarity index 100% rename from ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_old_style_app_tables.sql rename to ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.4-6.6.5/remove_old_style_app_tables.sql diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql index 8fda176db..47beb0c9c 100644 --- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql +++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.4-6.6.5.sql @@ -25,7 +25,7 @@ begin; -- Remove old style application tables, must be the first script executed. -\i default/6.6.4-6.6.5/remove_old_style_app_tables.sql +\i postgres/6.6.4-6.6.5/remove_old_style_app_tables.sql -- Adjust table cat_object_root_category_map -- (Constraint cat_obj_package_id_fk already removed in step 1) diff --git a/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql b/ccm-core/sql/ccm-core/upgrade/postgres/6.6.4-6.6.5/remove_old_style_app_tables.sql similarity index 86% rename from ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql rename to ccm-core/sql/ccm-core/upgrade/postgres/6.6.4-6.6.5/remove_old_style_app_tables.sql index fa8f1f773..7109bdc88 100644 --- a/ccm-core/sql/ccm-core/upgrade/default/6.6.4-6.6.5/remove_sitemap_app_table.sql +++ b/ccm-core/sql/ccm-core/upgrade/postgres/6.6.4-6.6.5/remove_old_style_app_tables.sql @@ -24,4 +24,8 @@ -- drop tables -drop table sitemap_app ; +drop table apm_package_type_listener_map ; +drop table apm_listeners ; +drop table site_nodes ; +drop table apm_packages CASCADE; +drop table apm_package_types CASCADE;