protect against "no bump for type"

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

diff --git a/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql b/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
index 00b641c..b441684 100644 (file)
--- a/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
+++ b/Open-ILS/src/sql/Pg/1.2.2.3-1.2.3.0-upgrade.sql
@@ -165,8 +165,10 @@ BEGIN
                 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 );
 

diff --git a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
index 09513c2..a5c6aaa 100644 (file)
--- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
+++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
@@ -210,8 +210,10 @@ BEGIN
                 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 );