[open-ils-commits] r10072 - branches/rel_1_2/Open-ILS/src/sql/Pg

[svn at svn.open-ils.org]

Author: miker
Date: 2008-07-18 10:51:06 -0400 (Fri, 18 Jul 2008)
New Revision: 10072

Modified:
   branches/rel_1_2/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
   branches/rel_1_2/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
Log:
protect against "no bump for type"

Modified: branches/rel_1_2/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
===================================================================
--- branches/rel_1_2/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql	2008-07-18 14:43:22 UTC (rev 10071)
+++ branches/rel_1_2/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql	2008-07-18 14:51:06 UTC (rev 10072)
@@ -165,8 +165,10 @@
                 END IF;
 
 
-                current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                    ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                IF tmp_text IS NOT NULL THEN
+                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
+                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                END IF;
 
                 used_ranks := array_append( used_ranks, rank_adjust.bump_type );
 

Modified: branches/rel_1_2/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
===================================================================
--- branches/rel_1_2/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-18 14:43:22 UTC (rev 10071)
+++ branches/rel_1_2/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-18 14:51:06 UTC (rev 10072)
@@ -210,8 +210,10 @@
                 END IF;
 
 
-                current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
-                    ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                IF tmp_text IS NOT NULL THEN
+                    current_rank := current_rank || ' * ( CASE WHEN ' || tmp_text ||
+                        ' THEN ' || rank_adjust.multiplier || '::REAL ELSE 1.0 END )';
+                END IF;
 
                 used_ranks := array_append( used_ranks, rank_adjust.bump_type );