From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 26 Nov 2014 04:18:21 +0000 (-0500)
Subject: Avoid ambiguous function references in upgrade script
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4083daedaef2dbf8e925ad5aadb90af0dbb1580e;p=contrib%2FConifer.git

Avoid ambiguous function references in upgrade script

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql b/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql
index 031d9bebc9..cc63aa44c6 100644
--- a/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/conifer_2_4-to_2_7.sql
@@ -24596,6 +24596,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_fixed_field(TEXT, TEXT);
+
 CREATE OR REPLACE FUNCTION vandelay.marc21_extract_all_fixed_fields( marc TEXT, use_default BOOL DEFAULT FALSE ) RETURNS SETOF biblio.record_ff_map AS $func$
 DECLARE
     tag_data    TEXT;
@@ -24632,6 +24634,8 @@ BEGIN
 END;
 $func$ LANGUAGE PLPGSQL;
 
+DROP FUNCTION IF EXISTS vandelay.marc21_extract_all_fixed_fields(TEXT);
+
 CREATE OR REPLACE FUNCTION biblio.marc21_extract_fixed_field_list( rid BIGINT, ff TEXT ) RETURNS TEXT[] AS $func$
     SELECT * FROM vandelay.marc21_extract_fixed_field_list( (SELECT marc FROM biblio.record_entry WHERE id = $1), $2, TRUE );
 $func$ LANGUAGE SQL;