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

[svn at svn.open-ils.org]

Author: miker
Date: 2009-07-15 12:50:30 -0400 (Wed, 15 Jul 2009)
New Revision: 13604

Modified:
   branches/rel_1_6_0/Open-ILS/src/sql/Pg/100.circ_matrix.sql
   branches/rel_1_6_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql
Log:
Merging 13602 from trunk: check for a null circ mod on an item when doing a non-null circ_mod test

Modified: branches/rel_1_6_0/Open-ILS/src/sql/Pg/100.circ_matrix.sql
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/sql/Pg/100.circ_matrix.sql	2009-07-15 16:49:48 UTC (rev 13603)
+++ branches/rel_1_6_0/Open-ILS/src/sql/Pg/100.circ_matrix.sql	2009-07-15 16:50:30 UTC (rev 13604)
@@ -166,7 +166,7 @@
                     CASE WHEN m.usr_age_upper_bound    IS NOT NULL THEN 0.5 ELSE 0 END DESC LOOP
 
             IF current_mp.circ_modifier IS NOT NULL THEN
-                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
+                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier OR item_object.circ_modifier IS NULL;
             END IF;
 
             IF current_mp.marc_type IS NOT NULL THEN

Modified: branches/rel_1_6_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql
===================================================================
--- branches/rel_1_6_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql	2009-07-15 16:49:48 UTC (rev 13603)
+++ branches/rel_1_6_0/Open-ILS/src/sql/Pg/110.hold_matrix.sql	2009-07-15 16:50:30 UTC (rev 13604)
@@ -93,7 +93,7 @@
             current_mp_weight := 5.0;
 
             IF current_mp.circ_modifier IS NOT NULL THEN
-                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier;
+                CONTINUE WHEN current_mp.circ_modifier <> item_object.circ_modifier OR item_object.circ_modifier IS NULL;
             END IF;
 
             IF current_mp.marc_type IS NOT NULL THEN