Patch from Jason Stephenson which adds "IF EXISTS" to all DROP SCHEMA statements...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16479 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/001.schema.offline.sql b/Open-ILS/src/sql/Pg/001.schema.offline.sql
index 51f2e40..1308b03 100644 (file)
--- 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 d1db535..043df44 100644 (file)
--- 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 e7b171f..f65ca48 100644 (file)
--- 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 7e5515f..7d2c0c3 100644 (file)
--- 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 afae8b3..7a5c1b4 100644 (file)
--- 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 795959a..c03275a 100644 (file)
--- 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 e3535c4..775876a 100644 (file)
--- 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 10a76d5..7543a77 100644 (file)
--- 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 6cdf2b9..c890a5d 100644 (file)
--- 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 001e8e3..65f0d4f 100644 (file)
--- 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 a64f51c..beceec9 100644 (file)
--- 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 f04265f..e84a996 100644 (file)
--- 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 f7951b3..a93bfd0 100644 (file)
--- 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 6d06d28..8c44a09 100644 (file)
--- 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 8272604..885f7ad 100644 (file)
--- 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 a1a4b86..41fed5b 100644 (file)
--- 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 1eadf55..5207729 100644 (file)
--- 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 300a15d..4090ca2 100644 (file)
--- 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 60a019b..a8ee115 100644 (file)
--- 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 156df6c..ded54c8 100644 (file)
--- 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 6bf3c10..cdcc587 100644 (file)
--- 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;