From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 14 Feb 2011 04:33:18 +0000 (-0500)
Subject: More fixups for "unpackaged" conversion scripts.
X-Git-Tag: REL9_1_ALPHA4~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de06cfe834dfff283deddfe1eb2945ba8a4fde2a;p=postgresql

More fixups for "unpackaged" conversion scripts.
---

diff --git a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
index c07793905a..befa96e908 100644
--- a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
+++ b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql
@@ -2,10 +2,18 @@
 
 ALTER EXTENSION sslinfo ADD function ssl_client_serial();
 ALTER EXTENSION sslinfo ADD function ssl_is_used();
-ALTER EXTENSION sslinfo ADD function ssl_version();
-ALTER EXTENSION sslinfo ADD function ssl_cipher();
 ALTER EXTENSION sslinfo ADD function ssl_client_cert_present();
 ALTER EXTENSION sslinfo ADD function ssl_client_dn_field(text);
 ALTER EXTENSION sslinfo ADD function ssl_issuer_field(text);
 ALTER EXTENSION sslinfo ADD function ssl_client_dn();
 ALTER EXTENSION sslinfo ADD function ssl_issuer_dn();
+
+-- These functions were not in 9.0:
+
+CREATE FUNCTION ssl_version() RETURNS text
+AS 'MODULE_PATHNAME', 'ssl_version'
+LANGUAGE C STRICT;
+
+CREATE FUNCTION ssl_cipher() RETURNS text
+AS 'MODULE_PATHNAME', 'ssl_cipher'
+LANGUAGE C STRICT;
diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql
index a4716cf916..2cd40d7960 100644
--- a/contrib/xml2/xml2--unpackaged--1.0.sql
+++ b/contrib/xml2/xml2--unpackaged--1.0.sql
@@ -13,4 +13,3 @@ ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text,text,text);
 ALTER EXTENSION xml2 ADD function xpath_string(text,text);
 ALTER EXTENSION xml2 ADD function xml_encode_special_chars(text);
 ALTER EXTENSION xml2 ADD function xml_valid(text);
-ALTER EXTENSION xml2 ADD function xml_is_well_formed(text);