From 13daeda834d079b405bcd01dca29b187da0967ef Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 20 Nov 2009 21:56:20 +0000
Subject: [PATCH] Add a safer version of the
reporter.disable_materialized_simple_record_trigger () function for
PostgreSQL 8.2 and up
Also, remove that vestigial 1.2.3-1.4 upgrade script. DIE ALREADY.
git-svn-id: svn://svn.open-ils.org/ILS/trunk@14992 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql | 22 ----------------------
Open-ILS/src/sql/Pg/reporter-schema.sql | 2 +-
.../0088.schema.reporter.simple_record_trigger.sql | 11 +++++++++++
4 files changed, 13 insertions(+), 24 deletions(-)
delete mode 100644 Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0088.schema.reporter.simple_record_trigger.sql
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index af4bf8764d..2294ca13f8 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0087'); -- atz
+INSERT INTO config.upgrade_log (version) VALUES ('0088'); -- dbs
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
deleted file mode 100644
index fcf439619a..0000000000
--- a/Open-ILS/src/sql/Pg/1.2.3-1.4-upgrade-db.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Enable LIKE to use an index for database clusters with locales other than C or POSIX */
-CREATE INDEX authority_full_rec_value_tpo_index ON authority.full_rec (value text_pattern_ops);
-
-/* Upgrade to MODS32 for transforms */
-ALTER TABLE config.metabib_field
- ALTER COLUMN format SET DEFAULT 'mods32';
-UPDATE config.metabib_field
- SET format = 'mods32';
-
-/* Update index definitions to MODS32-compliant XPaths */
-UPDATE config.metabib_field
- SET xpath = $$//mods:mods/mods:name[@type='corporate']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
- WHERE field_class = 'author' AND name = 'corporate';
-UPDATE config.metabib_field
- SET xpath = $$//mods:mods/mods:name[@type='personal']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
- WHERE field_class = 'author' AND name = 'personal';
-UPDATE config.metabib_field
- SET xpath = $$//mods:mods/mods:name[@type='conference']/mods:namePart[../mods:role/mods:roleTerm[text()='creator']]$$
- WHERE field_class = 'author' AND name = 'conference';
-/* And they all want mods32: as their prefix */
-UPDATE config.metabib_field
- SET xpath = regexp_replace(xpath, 'mods:', 'mods32:', 'g');
diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql
index 5e16c2c594..55224a4a36 100644
--- a/Open-ILS/src/sql/Pg/reporter-schema.sql
+++ b/Open-ILS/src/sql/Pg/reporter-schema.sql
@@ -244,7 +244,7 @@ CREATE TRIGGER zzz_update_materialized_simple_rec_delete_tgr
CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
- DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
+ DROP TRIGGER IF EXISTS zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
$$ LANGUAGE SQL;
CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$
diff --git a/Open-ILS/src/sql/Pg/upgrade/0088.schema.reporter.simple_record_trigger.sql b/Open-ILS/src/sql/Pg/upgrade/0088.schema.reporter.simple_record_trigger.sql
new file mode 100644
index 0000000000..a551e8be44
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0088.schema.reporter.simple_record_trigger.sql
@@ -0,0 +1,11 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0088'); -- dbs
+
+-- Take advantage of the "IF EXISTS" option that has existed since
+-- PostgreSQL 8.2 to avoid SQL errors
+CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
+ DROP TRIGGER IF EXISTS zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
+$$ LANGUAGE SQL;
+
+COMMIT;
--
2.11.0