Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 43666e8

Browse files
committed
Improve documentation/warning when --with-libxml is not used in the
installation.
1 parent 618aec7 commit 43666e8

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

doc/src/sgml/datatype.sgml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.193 2007/04/02 15:27:02 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.194 2007/04/05 01:46:27 momjian Exp $ -->
22

33
<chapter id="datatype">
44
<title id="datatype-title">Data Types</title>
@@ -3202,11 +3202,13 @@ SELECT * FROM test;
32023202
advantage over storing XML data in a <type>text</type> field is that it
32033203
checks the input values for well-formedness, and there are support
32043204
functions to perform type-safe operations on it; see <xref
3205-
linkend="functions-xml">.
3205+
linkend="functions-xml">. Use of this data type requires the
3206+
installation to have been built with <command>configure
3207+
--with-libxml</>.
32063208
</para>
32073209

32083210
<para>
3209-
In particular, the <type>xml</type> type can store well-formed
3211+
The <type>xml</type> type can store well-formed
32103212
<quote>documents</quote>, as defined by the XML standard, as well
32113213
as <quote>content</quote> fragments, which are defined by the
32123214
production <literal>XMLDecl? content</literal> in the XML

doc/src/sgml/func.sgml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.374 2007/04/02 15:27:02 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.375 2007/04/05 01:46:27 momjian Exp $ -->
22

33
<chapter id="functions">
44
<title>Functions and Operators</title>
@@ -7511,7 +7511,9 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
75117511
linkend="datatype-xml"> for information about the <type>xml</type>
75127512
type. The function-like expressions <function>xmlparse</function>
75137513
and <function>xmlserialize</function> for converting to and from
7514-
type <type>xml</type> are not repeated here.
7514+
type <type>xml</type> are not repeated here. Use of many of these
7515+
<type>xml</type> functions requires the installation to have been built
7516+
with <command>configure --with-libxml</>.
75157517
</para>
75167518

75177519
<sect2>

src/backend/utils/adt/xml.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.39 2007/04/02 03:49:39 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.40 2007/04/05 01:46:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -112,7 +112,7 @@ XmlOptionType xmloption;
112112
#define NO_XML_SUPPORT() \
113113
ereport(ERROR, \
114114
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), \
115-
errmsg("no XML support in this installation")))
115+
errmsg("feature not supported; no libxml support in this installation")))
116116

117117

118118
#define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))

0 commit comments

Comments
 (0)