From febd34cdb64ead254dd97917a21bf14b23aaf07d Mon Sep 17 00:00:00 2001 From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Fri, 21 May 2010 17:01:32 +0000 Subject: [PATCH] Patch from Jason Stephenson which adds "IF EXISTS" to all DROP SCHEMA statements where it is currently missing in the scripts in Open-ILS/src/sql/Pg directory. git-svn-id: svn://svn.open-ils.org/ILS/trunk@16479 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/001.schema.offline.sql | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 4 ++-- Open-ILS/src/sql/Pg/005.schema.actors.sql | 2 +- Open-ILS/src/sql/Pg/006.schema.permissions.sql | 2 +- Open-ILS/src/sql/Pg/010.schema.biblio.sql | 2 +- Open-ILS/src/sql/Pg/011.schema.authority.sql | 2 +- Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 2 +- Open-ILS/src/sql/Pg/015.schema.staging.sql | 2 +- Open-ILS/src/sql/Pg/030.schema.metabib.sql | 2 +- Open-ILS/src/sql/Pg/040.schema.asset.sql | 2 +- Open-ILS/src/sql/Pg/070.schema.container.sql | 2 +- Open-ILS/src/sql/Pg/080.schema.money.sql | 2 +- Open-ILS/src/sql/Pg/090.schema.action.sql | 2 +- Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql | 2 +- Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql | 4 ++-- Open-ILS/src/sql/Pg/200.schema.acq.sql | 2 +- Open-ILS/src/sql/Pg/210.schema.serials.sql | 2 +- Open-ILS/src/sql/Pg/300.schema.staged_search.sql | 2 +- Open-ILS/src/sql/Pg/900.audit-functions.sql | 2 +- Open-ILS/src/sql/Pg/extend-reporter.sql | 2 +- Open-ILS/src/sql/Pg/reporter-schema.sql | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Open-ILS/src/sql/Pg/001.schema.offline.sql b/Open-ILS/src/sql/Pg/001.schema.offline.sql index 51f2e40613..1308b03c40 100644 --- a/Open-ILS/src/sql/Pg/001.schema.offline.sql +++ b/Open-ILS/src/sql/Pg/001.schema.offline.sql @@ -16,7 +16,7 @@ */ -DROP SCHEMA offline CASCADE; +DROP SCHEMA IF EXISTS offline CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index d1db535c26..043df4457c 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -17,8 +17,8 @@ -DROP SCHEMA stats CASCADE; -DROP SCHEMA config CASCADE; +DROP SCHEMA IF EXISTS stats CASCADE; +DROP SCHEMA IF EXISTS config CASCADE; BEGIN; CREATE SCHEMA stats; diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql index e7b171fe1d..f65ca48b2e 100644 --- a/Open-ILS/src/sql/Pg/005.schema.actors.sql +++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql @@ -1,4 +1,4 @@ -DROP SCHEMA actor CASCADE; +DROP SCHEMA IF EXISTS actor CASCADE; BEGIN; CREATE SCHEMA actor; diff --git a/Open-ILS/src/sql/Pg/006.schema.permissions.sql b/Open-ILS/src/sql/Pg/006.schema.permissions.sql index 7e5515fcfc..7d2c0c3426 100644 --- a/Open-ILS/src/sql/Pg/006.schema.permissions.sql +++ b/Open-ILS/src/sql/Pg/006.schema.permissions.sql @@ -16,7 +16,7 @@ */ -DROP SCHEMA permission CASCADE; +DROP SCHEMA IF EXISTS permission CASCADE; BEGIN; CREATE SCHEMA permission; diff --git a/Open-ILS/src/sql/Pg/010.schema.biblio.sql b/Open-ILS/src/sql/Pg/010.schema.biblio.sql index afae8b3277..7a5c1b48d4 100644 --- a/Open-ILS/src/sql/Pg/010.schema.biblio.sql +++ b/Open-ILS/src/sql/Pg/010.schema.biblio.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA biblio CASCADE; +DROP SCHEMA IF EXISTS biblio CASCADE; BEGIN; CREATE SCHEMA biblio; diff --git a/Open-ILS/src/sql/Pg/011.schema.authority.sql b/Open-ILS/src/sql/Pg/011.schema.authority.sql index 795959a6fe..c03275a637 100644 --- a/Open-ILS/src/sql/Pg/011.schema.authority.sql +++ b/Open-ILS/src/sql/Pg/011.schema.authority.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA authority CASCADE; +DROP SCHEMA IF EXISTS authority CASCADE; BEGIN; CREATE SCHEMA authority; diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql index e3535c425c..775876aed3 100644 --- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql +++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql @@ -1,4 +1,4 @@ -DROP SCHEMA vandelay CASCADE; +DROP SCHEMA IF EXISTS vandelay CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/015.schema.staging.sql b/Open-ILS/src/sql/Pg/015.schema.staging.sql index 10a76d51f8..7543a772f0 100644 --- a/Open-ILS/src/sql/Pg/015.schema.staging.sql +++ b/Open-ILS/src/sql/Pg/015.schema.staging.sql @@ -1,4 +1,4 @@ -DROP SCHEMA staging CASCADE; +DROP SCHEMA IF EXISTS staging CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql index 6cdf2b9ab5..c890a5df66 100644 --- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql +++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA metabib CASCADE; +DROP SCHEMA IF EXISTS metabib CASCADE; BEGIN; CREATE SCHEMA metabib; diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql index 001e8e3155..65f0d4f9be 100644 --- a/Open-ILS/src/sql/Pg/040.schema.asset.sql +++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA asset CASCADE; +DROP SCHEMA IF EXISTS asset CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/070.schema.container.sql b/Open-ILS/src/sql/Pg/070.schema.container.sql index a64f51c1e1..beceec94a0 100644 --- a/Open-ILS/src/sql/Pg/070.schema.container.sql +++ b/Open-ILS/src/sql/Pg/070.schema.container.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA container CASCADE; +DROP SCHEMA IF EXISTS container CASCADE; BEGIN; CREATE SCHEMA container; diff --git a/Open-ILS/src/sql/Pg/080.schema.money.sql b/Open-ILS/src/sql/Pg/080.schema.money.sql index f04265fac3..e84a996610 100644 --- a/Open-ILS/src/sql/Pg/080.schema.money.sql +++ b/Open-ILS/src/sql/Pg/080.schema.money.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA money CASCADE; +DROP SCHEMA IF EXISTS money CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql index f7951b386d..a93bfd051a 100644 --- a/Open-ILS/src/sql/Pg/090.schema.action.sql +++ b/Open-ILS/src/sql/Pg/090.schema.action.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA action CASCADE; +DROP SCHEMA IF EXISTS action CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql index 6d06d2880b..8c44a09f87 100644 --- a/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.2.1-1.2.2-upgrade-db.sql @@ -158,7 +158,7 @@ $$ LANGUAGE 'plperlu' STRICT IMMUTABLE; COMMIT; -DROP SCHEMA search CASCADE; +DROP SCHEMA IF EXISTS search CASCADE; BEGIN; ------------------------------------------------------------------- diff --git a/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql index 82726048a8..885f7adf0e 100644 --- a/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.4.0.5-1.6.0.0-upgrade-db.sql @@ -16,8 +16,8 @@ -DROP SCHEMA acq CASCADE; -DROP SCHEMA serial CASCADE; +DROP SCHEMA IF EXISTS acq CASCADE; +DROP SCHEMA IF EXISTS serial CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql index a1a4b8696f..41fed5bd10 100644 --- a/Open-ILS/src/sql/Pg/200.schema.acq.sql +++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql @@ -1,4 +1,4 @@ -DROP SCHEMA acq CASCADE; +DROP SCHEMA IF EXISTS acq CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/210.schema.serials.sql b/Open-ILS/src/sql/Pg/210.schema.serials.sql index 1eadf55db3..5207729fe9 100644 --- a/Open-ILS/src/sql/Pg/210.schema.serials.sql +++ b/Open-ILS/src/sql/Pg/210.schema.serials.sql @@ -1,6 +1,6 @@ -DROP SCHEMA serial CASCADE; +DROP SCHEMA IF EXISTS serial CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql index 300a15d3fe..4090ca22b6 100644 --- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql +++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql @@ -15,7 +15,7 @@ */ -DROP SCHEMA search CASCADE; +DROP SCHEMA IF EXISTS search CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/900.audit-functions.sql b/Open-ILS/src/sql/Pg/900.audit-functions.sql index 60a019bb1d..a8ee1158ba 100644 --- a/Open-ILS/src/sql/Pg/900.audit-functions.sql +++ b/Open-ILS/src/sql/Pg/900.audit-functions.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA auditor CASCADE; +DROP SCHEMA IF EXISTS auditor CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/extend-reporter.sql b/Open-ILS/src/sql/Pg/extend-reporter.sql index 156df6cecf..ded54c873f 100644 --- a/Open-ILS/src/sql/Pg/extend-reporter.sql +++ b/Open-ILS/src/sql/Pg/extend-reporter.sql @@ -14,7 +14,7 @@ * */ -DROP SCHEMA extend_reporter CASCADE; +DROP SCHEMA IF EXISTS extend_reporter CASCADE; BEGIN; diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql index 6bf3c1005f..cdcc587b44 100644 --- a/Open-ILS/src/sql/Pg/reporter-schema.sql +++ b/Open-ILS/src/sql/Pg/reporter-schema.sql @@ -15,7 +15,7 @@ * */ -DROP SCHEMA reporter CASCADE; +DROP SCHEMA IF EXISTS reporter CASCADE; BEGIN; -- 2.11.0