[open-ils-commits] r16809 - in trunk/Open-ILS/src/sql/Pg: . upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-06-24 14:51:57 -0400 (Thu, 24 Jun 2010)
New Revision: 16809

Modified:
   trunk/Open-ILS/src/sql/Pg/020.schema.functions.sql
   trunk/Open-ILS/src/sql/Pg/upgrade/0315.data.authority-related-index-normalizers.sql
Log:
doh, another thinko. spotted by Scott McKellar

Modified: trunk/Open-ILS/src/sql/Pg/020.schema.functions.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/020.schema.functions.sql	2010-06-24 17:15:16 UTC (rev 16808)
+++ trunk/Open-ILS/src/sql/Pg/020.schema.functions.sql	2010-06-24 18:51:57 UTC (rev 16809)
@@ -100,9 +100,9 @@
     SELECT regexp_replace($1, ',', '', 'g');
 $$ LANGUAGE SQL STRICT IMMUTABLE;
 
-CREATE OR REPLACE FUNCTION public.remove_paren_substring( TEXT ) RETURNS TEXT AS $$
+CREATE OR REPLACE FUNCTION public.remove_paren_substring( TEXT ) RETURNS TEXT AS $func$
     SELECT regexp_replace($1, $$\([^)]+\)$$, '', 'g');
-$$ LANGUAGE SQL STRICT IMMUTABLE;
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
 
 CREATE OR REPLACE FUNCTION public.remove_whitespace( TEXT ) RETURNS TEXT AS $$
     SELECT regexp_replace(normalize_space($1), E'\\s+', '', 'g');

Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0315.data.authority-related-index-normalizers.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0315.data.authority-related-index-normalizers.sql	2010-06-24 17:15:16 UTC (rev 16808)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0315.data.authority-related-index-normalizers.sql	2010-06-24 18:51:57 UTC (rev 16809)
@@ -2,9 +2,9 @@
 
 INSERT INTO config.upgrade_log (version) VALUES ('0315'); --miker
 
-CREATE OR REPLACE FUNCTION public.remove_paren_substring( TEXT ) RETURNS TEXT AS $$
+CREATE OR REPLACE FUNCTION public.remove_paren_substring( TEXT ) RETURNS TEXT AS $func$
     SELECT regexp_replace($1, $$\([^)]+\)$$, '', 'g');
-$$ LANGUAGE SQL STRICT IMMUTABLE;
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
 
 INSERT INTO config.metabib_field ( id, field_class, name, label, format, xpath, facet_field, search_field ) VALUES
     (26, 'identifier', 'arcn', oils_i18n_gettext(26, 'Authority record control number', 'cmf', 'label'), 'marcxml', $$//marc:subfield[@code='0']$$, TRUE, FALSE );