[open-ils-commits] r18993 - in branches/rel_1_6_2/Open-ILS/src/sql/Pg: . upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-12-13 12:52:33 -0500 (Mon, 13 Dec 2010)
New Revision: 18993

Added:
   branches/rel_1_6_2/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql
Modified:
   branches/rel_1_6_2/Open-ILS/src/sql/Pg/002.schema.config.sql
Log:
Backport of r18988 from rel_1_6: repaired order-by in update_hard_due_dates function to prevent sql errors

Modified: branches/rel_1_6_2/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_1_6_2/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-12-13 17:47:13 UTC (rev 18992)
+++ branches/rel_1_6_2/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-12-13 17:52:33 UTC (rev 18993)
@@ -292,7 +292,6 @@
     active_date         TIMESTAMPTZ NOT NULL
 );
 
-
 CREATE OR REPLACE FUNCTION config.update_hard_due_dates () RETURNS INT AS $func$
 DECLARE
     temp_value  config.hard_due_date_values%ROWTYPE;
@@ -302,7 +301,7 @@
       SELECT  DISTINCT ON (hard_due_date) *
         FROM  config.hard_due_date_values
         WHERE active_date <= NOW() -- We've passed (or are at) the rollover time
-        ORDER BY active_date DESC -- Latest (nearest to us) active time
+        ORDER BY hard_due_date, active_date DESC -- Latest (nearest to us) active time
    LOOP
         UPDATE  config.hard_due_date
           SET   ceiling_date = temp_value.ceiling_date

Copied: branches/rel_1_6_2/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql (from rev 18988, branches/rel_1_6/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql)
===================================================================
--- branches/rel_1_6_2/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql	                        (rev 0)
+++ branches/rel_1_6_2/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql	2010-12-13 17:52:33 UTC (rev 18993)
@@ -0,0 +1,30 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0470');
+
+CREATE OR REPLACE FUNCTION config.update_hard_due_dates () RETURNS INT AS $func$
+DECLARE
+    temp_value  config.hard_due_date_values%ROWTYPE;
+    updated     INT := 0;
+BEGIN
+    FOR temp_value IN
+      SELECT  DISTINCT ON (hard_due_date) *
+        FROM  config.hard_due_date_values
+        WHERE active_date <= NOW() -- We've passed (or are at) the rollover time
+        ORDER BY hard_due_date, active_date DESC -- Latest (nearest to us) active time
+   LOOP
+        UPDATE  config.hard_due_date
+          SET   ceiling_date = temp_value.ceiling_date
+          WHERE id = temp_value.hard_due_date
+                AND ceiling_date <> temp_value.ceiling_date; -- Time is equal if we've already updated the chdd
+
+        IF FOUND THEN
+            updated := updated + 1;
+        END IF;
+    END LOOP;
+
+    RETURN updated;
+END;
+$func$ LANGUAGE plpgsql;
+
+COMMIT;