[open-ils-commits] r14996 - branches/rel_1_6_0/Open-ILS/src/sql/Pg (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-11-20 17:07:26 -0500 (Fri, 20 Nov 2009)
New Revision: 14996

Added:
   branches/rel_1_6_0/Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql
Modified:
   branches/rel_1_6_0/Open-ILS/src/sql/Pg/reporter-schema.sql
Log:
Backport a safer version of the reporter.disable_materialized_simple_record_trigger () function

This one works with PostgreSQL 8.1 and up, so it's targeted to the 1.4 branch. 
But just in case there are stragglers using PostgreSQL 8.3 with 1.6, we'll use it here, too.


Copied: branches/rel_1_6_0/Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql (from rev 14995, branches/rel_1_6/Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql)
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql	                        (rev 0)
+++ branches/rel_1_6_0/Open-ILS/src/sql/Pg/1.6.0.0-1.6.0.1-upgrade-db.sql	2009-11-20 22:07:26 UTC (rev 14996)
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2009  Equinox Software, Inc.
+ * Mike Rylander <miker at esilibrary.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+
+INSERT INTO config.upgrade_log (version) VALUES ('1.6.0.1');
+
+CREATE OR REPLACE FUNCTION reporter.disable_materialized_simple_record_trigger () RETURNS VOID AS $$
+    DECLARE x RECORD;
+    BEGIN
+        -- DROP TRIGGER IF EXISTS is only available starting with PostgreSQL 8.2
+        FOR x IN SELECT tgname FROM pg_trigger WHERE tgname = 'zzz_update_materialized_simple_record_tgr'
+        LOOP
+            DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
+        END LOOP;
+    END;
+$$ LANGUAGE plpgsql;
+

Modified: branches/rel_1_6_0/Open-ILS/src/sql/Pg/reporter-schema.sql
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/sql/Pg/reporter-schema.sql	2009-11-20 22:06:57 UTC (rev 14995)
+++ branches/rel_1_6_0/Open-ILS/src/sql/Pg/reporter-schema.sql	2009-11-20 22:07:26 UTC (rev 14996)
@@ -244,8 +244,15 @@
 
 
 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;
-$$ LANGUAGE SQL;
+    DECLARE x RECORD;
+    BEGIN
+        -- DROP TRIGGER IF EXISTS is only available starting with PostgreSQL 8.2
+        FOR x IN SELECT tgname FROM pg_trigger WHERE tgname = 'zzz_update_materialized_simple_record_tgr'
+        LOOP
+            DROP TRIGGER zzz_update_materialized_simple_record_tgr ON metabib.real_full_rec;
+        END LOOP;
+    END;
+$$ LANGUAGE plpgsql;
 
 CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$