Changeset 9476 for trunk/Open-ILS/src/sql/Pg/reporter-schema.sql

Timestamp:

04/28/08 08:15:25 (3 months ago)

Author:

miker

Message:

improved concurrency detection

Files:

• trunk/Open-ILS/src/sql/Pg/reporter-schema.sql (modified) (1 diff)

trunk/Open-ILS/src/sql/Pg/reporter-schema.sql

@@ -158 +158 @@
 
 CREATE OR REPLACE FUNCTION reporter.simple_rec_sync () RETURNS TRIGGER AS $$
+DECLARE
+    r_id        BIGINT;
+    new_data    RECORD;
 BEGIN
-    IF TG_OP IN ('UPDATE','DELETE') THEN
-        DELETE FROM reporter.materialized_simple_record WHERE id = OLD.record;
+    IF TG_OP IN ('DELETE') THEN
+        r_id := OLD.record;
+    ELSE
+        r_id := NEW.record;
     END IF;
 
-    IF TG_OP IN ('INSERT','UPDATE') AND NOT NEW.deleted THEN
-        INSERT INTO reporter.materialized_simple_record SELECT * FROM reporter.old_super_simple_record WHERE id = NEW.record;
+    SELECT * INTO new_data FROM reporter.materialized_simple_record WHERE id = r_id FOR UPDATE;
+    DELETE FROM reporter.materialized_simple_record WHERE id = r_id;
+
+    IF TG_OP IN ('DELETE') THEN
+        RETURN OLD;
+    ELSE
+        INSERT INTO reporter.materialized_simple_record SELECT DISTINCT ON (id) * FROM reporter.old_super_simple_record WHERE id = NEW.record;
+        RETURN NEW;
     END IF;