From 3d4be10ca03a32b26d42277f9b3cafb6525808e7 Mon Sep 17 00:00:00 2001 From: jensp Date: Sun, 14 Dec 2014 09:26:50 +0000 Subject: [PATCH] Small refinement, Oracle or CCM seams to include SQL files for Oracle even if the line with the include is commented out. git-svn-id: https://svn.libreccm.org/ccm/trunk@3050 8810af33-2d31-482b-a856-94f89814c4df --- .../upgrade/oracle-se-6.6.0-6.6.1.sql | 2 +- .../6.6.0-6.6.1/recreate_users_index.sql | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql index 4af87fe61..f0827b820 100644 --- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -26,4 +26,4 @@ PROMPT Red Hat Enterprise CORE 6.6.0 -> 6.6.1 Upgrade Script (Oracle) -- Once while updated postgres database required, not needed for oracle, it -- is still/already there (during tests with Camden database). --- @@ oracle-se/6.6.0-6.6.1/recreate_users_index.sql \ No newline at end of file +-- oracle-se/6.6.0-6.6.1/recreate_users_index.sql \ No newline at end of file diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.0-6.6.1/recreate_users_index.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.0-6.6.1/recreate_users_index.sql index fd0c3efa1..6af850232 100644 --- a/ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.0-6.6.1/recreate_users_index.sql +++ b/ccm-core/sql/ccm-core/upgrade/oracle-se/6.6.0-6.6.1/recreate_users_index.sql @@ -21,17 +21,17 @@ -- For Oracle some magic is necessary. Thanks to James Li at Camden for providing the commands -- below. -CREATE OR REPLACE PROCEDURE DROP_INDEX_IF_EXISTS(INDEX_NAME IN VARCHAR2) AS -BEGIN - EXECUTE IMMEDIATE 'drop index ' || upper(INDEX_NAME); -EXCEPTION - WHEN OTHERS THEN - NULL; -END DROP_INDEX_IF_EXISTS; +-- CREATE OR REPLACE PROCEDURE DROP_INDEX_IF_EXISTS(INDEX_NAME IN VARCHAR2) AS +-- BEGIN +-- EXECUTE IMMEDIATE 'drop index ' || upper(INDEX_NAME); +-- EXCEPTION +-- WHEN OTHERS THEN +-- NULL; +--END DROP_INDEX_IF_EXISTS; -- First: Drop index to avoid an error if it already exists -drop_index_if_exists('users_lower_screen_name_idx') ; +-- drop_index_if_exists('users_lower_screen_name_idx') ; -create unique index users_lower_screen_name_idx on users - USING btree (lower((screen_name)::text)); \ No newline at end of file +-- create unique index users_lower_screen_name_idx on users +-- USING btree (lower((screen_name)::text)); \ No newline at end of file