summaryrefslogtreecommitdiff
path: root/contrib/xml2/pgxml.sql.in
diff options
context:
space:
mode:
authorTom Lane2010-03-01 18:07:59 +0000
committerTom Lane2010-03-01 18:07:59 +0000
commitd6a6f8c6be4b6d6a9e90e92d91a83225bfe8d29d (patch)
treee1730344410a4d0809c79540c9ada40829b1b0ff /contrib/xml2/pgxml.sql.in
parent8373490607c437445163da8b7a44787f997ebf84 (diff)
Fix contrib/xml2 so regression test still works when it's built without libxslt.
This involves modifying the module to have a stable ABI, that is, the xslt_process() function still exists even without libxslt. It throws a runtime error if called, but doesn't prevent executing the CREATE FUNCTION call. This is a good thing anyway to simplify cross-version upgrades.
Diffstat (limited to 'contrib/xml2/pgxml.sql.in')
-rw-r--r--contrib/xml2/pgxml.sql.in11
1 files changed, 1 insertions, 10 deletions
diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in
index 09957d6ce0..98d8f81b57 100644
--- a/contrib/xml2/pgxml.sql.in
+++ b/contrib/xml2/pgxml.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.11 2007/11/13 04:24:29 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.12 2010/03/01 18:07:59 tgl Exp $ */
-- Adjust this setting to control where the objects get created.
SET search_path = public;
@@ -40,22 +40,17 @@ CREATE OR REPLACE FUNCTION xpath_list(text,text,text) RETURNS text
AS 'MODULE_PATHNAME'
LANGUAGE C STRICT IMMUTABLE;
-
CREATE OR REPLACE FUNCTION xpath_list(text,text) RETURNS text
AS 'SELECT xpath_list($1,$2,'','')'
LANGUAGE SQL STRICT IMMUTABLE;
-
-
-- Wrapper functions for nodeset where no tags needed
-
CREATE OR REPLACE FUNCTION xpath_nodeset(text,text)
RETURNS text
AS 'SELECT xpath_nodeset($1,$2,'''','''')'
LANGUAGE SQL STRICT IMMUTABLE;
-
CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text)
RETURNS text
AS 'SELECT xpath_nodeset($1,$2,'''',$3)'
@@ -69,9 +64,6 @@ AS 'MODULE_PATHNAME'
LANGUAGE C STRICT STABLE;
-- XSLT functions
--- Delete from here to the end of the file if you are not compiling with
--- XSLT support.
-
CREATE OR REPLACE FUNCTION xslt_process(text,text,text)
RETURNS text
@@ -79,7 +71,6 @@ AS 'MODULE_PATHNAME'
LANGUAGE C STRICT VOLATILE;
-- the function checks for the correct argument count
-
CREATE OR REPLACE FUNCTION xslt_process(text,text)
RETURNS text
AS 'MODULE_PATHNAME'