repaired order-by in update_hard_due_dates function to prevent sql errors

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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index a5dcd7d..7ec0e20 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -70,7 +70,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0469'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0470'); -- berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,
@@ -358,7 +358,6 @@ CREATE TABLE config.hard_due_date_values (
     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;
@@ -368,7 +367,7 @@ BEGIN
       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

diff --git a/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql b/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql
new file mode 100644 (file)
index 0000000..b6b4c3a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0470.schema.config_update_hard_due_dates_repairs.sql
@@ -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;