diff --git a/reference/pgsql/constants.xml b/reference/pgsql/constants.xml
index 3b055ec8f..56dd97954 100755
--- a/reference/pgsql/constants.xml
+++ b/reference/pgsql/constants.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: a0ae28d3bc85f927c22649ebd9a590b921534b7d Maintainer: dallas Status: ready -->
+<!-- EN-Revision: 5bc8ebe3c1e0bb133e058f1b8eb34a721149e893 Maintainer: dallas Status: ready -->
 <!-- CREDITS: mowangjuanzi -->
 <appendix xml:id="pgsql.constants" xmlns="http://docbook.org/ns/docbook">
  &reftitle.constants;
@@ -9,7 +9,7 @@
  <variablelist>
   <varlistentry xml:id="constant.pgsql-libpq-version">
    <term>
-    <constant>PGSQL_LIBPQ_VERSION</constant> 
+    <constant>PGSQL_LIBPQ_VERSION</constant>
     (<type>string</type>)
    </term>
    <listitem>
@@ -20,7 +20,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-libpq-version-str">
    <term>
-    <constant>PGSQL_LIBPQ_VERSION_STR</constant> 
+    <constant>PGSQL_LIBPQ_VERSION_STR</constant>
     (<type>string</type>)
    </term>
    <listitem>
@@ -32,7 +32,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-assoc">
    <term>
-    <constant>PGSQL_ASSOC</constant> 
+    <constant>PGSQL_ASSOC</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -43,7 +43,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-num">
    <term>
-    <constant>PGSQL_NUM</constant> 
+    <constant>PGSQL_NUM</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -54,7 +54,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-both">
    <term>
-    <constant>PGSQL_BOTH</constant> 
+    <constant>PGSQL_BOTH</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -65,7 +65,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-connect-force-new">
    <term>
-    <constant>PGSQL_CONNECT_FORCE_NEW</constant> 
+    <constant>PGSQL_CONNECT_FORCE_NEW</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -76,7 +76,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-connect-async">
    <term>
-    <constant>PGSQL_CONNECT_ASYNC</constant> 
+    <constant>PGSQL_CONNECT_ASYNC</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -175,7 +175,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-seek-set">
    <term>
-    <constant>PGSQL_SEEK_SET</constant> 
+    <constant>PGSQL_SEEK_SET</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -186,7 +186,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-seek-cur">
    <term>
-    <constant>PGSQL_SEEK_CUR</constant> 
+    <constant>PGSQL_SEEK_CUR</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -197,7 +197,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-seek-end">
    <term>
-    <constant>PGSQL_SEEK_END</constant> 
+    <constant>PGSQL_SEEK_END</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -208,7 +208,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-empty-query">
    <term>
-    <constant>PGSQL_EMPTY_QUERY</constant> 
+    <constant>PGSQL_EMPTY_QUERY</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -219,7 +219,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-command-ok">
    <term>
-    <constant>PGSQL_COMMAND_OK</constant> 
+    <constant>PGSQL_COMMAND_OK</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -230,7 +230,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-tuples-ok">
    <term>
-    <constant>PGSQL_TUPLES_OK</constant> 
+    <constant>PGSQL_TUPLES_OK</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -241,7 +241,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-copy-out">
    <term>
-    <constant>PGSQL_COPY_OUT</constant> 
+    <constant>PGSQL_COPY_OUT</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -252,7 +252,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-copy-in">
    <term>
-    <constant>PGSQL_COPY_IN</constant> 
+    <constant>PGSQL_COPY_IN</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -263,7 +263,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-bad-response">
    <term>
-    <constant>PGSQL_BAD_RESPONSE</constant> 
+    <constant>PGSQL_BAD_RESPONSE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -274,7 +274,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-nonfatal-error">
    <term>
-    <constant>PGSQL_NONFATAL_ERROR</constant> 
+    <constant>PGSQL_NONFATAL_ERROR</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -285,7 +285,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-fatal-error">
    <term>
-    <constant>PGSQL_FATAL_ERROR</constant> 
+    <constant>PGSQL_FATAL_ERROR</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -296,7 +296,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-transaction-idle">
    <term>
-    <constant>PGSQL_TRANSACTION_IDLE</constant> 
+    <constant>PGSQL_TRANSACTION_IDLE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -307,7 +307,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-transaction-active">
    <term>
-    <constant>PGSQL_TRANSACTION_ACTIVE</constant> 
+    <constant>PGSQL_TRANSACTION_ACTIVE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -318,7 +318,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-transaction-intrans">
    <term>
-    <constant>PGSQL_TRANSACTION_INTRANS</constant> 
+    <constant>PGSQL_TRANSACTION_INTRANS</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -329,7 +329,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-transaction-inerror">
    <term>
-    <constant>PGSQL_TRANSACTION_INERROR</constant> 
+    <constant>PGSQL_TRANSACTION_INERROR</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -340,7 +340,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-transaction-unknown">
    <term>
-    <constant>PGSQL_TRANSACTION_UNKNOWN</constant> 
+    <constant>PGSQL_TRANSACTION_UNKNOWN</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -351,7 +351,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-severity">
    <term>
-    <constant>PGSQL_DIAG_SEVERITY</constant> 
+    <constant>PGSQL_DIAG_SEVERITY</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -365,7 +365,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-sqlstate">
    <term>
-    <constant>PGSQL_DIAG_SQLSTATE</constant> 
+    <constant>PGSQL_DIAG_SQLSTATE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -377,7 +377,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-message-primary">
    <term>
-    <constant>PGSQL_DIAG_MESSAGE_PRIMARY</constant> 
+    <constant>PGSQL_DIAG_MESSAGE_PRIMARY</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -389,7 +389,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-message-detail">
    <term>
-    <constant>PGSQL_DIAG_MESSAGE_DETAIL</constant> 
+    <constant>PGSQL_DIAG_MESSAGE_DETAIL</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -401,7 +401,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-message-hint">
    <term>
-    <constant>PGSQL_DIAG_MESSAGE_HINT</constant> 
+    <constant>PGSQL_DIAG_MESSAGE_HINT</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -413,7 +413,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-statement-position">
    <term>
-    <constant>PGSQL_DIAG_STATEMENT_POSITION</constant> 
+    <constant>PGSQL_DIAG_STATEMENT_POSITION</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -425,7 +425,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-internal-position">
    <term>
-    <constant>PGSQL_DIAG_INTERNAL_POSITION</constant> 
+    <constant>PGSQL_DIAG_INTERNAL_POSITION</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -441,7 +441,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-internal-query">
    <term>
-    <constant>PGSQL_DIAG_INTERNAL_QUERY</constant> 
+    <constant>PGSQL_DIAG_INTERNAL_QUERY</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -453,7 +453,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-context">
    <term>
-    <constant>PGSQL_DIAG_CONTEXT</constant> 
+    <constant>PGSQL_DIAG_CONTEXT</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -468,7 +468,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-source-file">
    <term>
-    <constant>PGSQL_DIAG_SOURCE_FILE</constant> 
+    <constant>PGSQL_DIAG_SOURCE_FILE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -480,7 +480,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-diag-source-line">
    <term>
-    <constant>PGSQL_DIAG_SOURCE_LINE</constant> 
+    <constant>PGSQL_DIAG_SOURCE_LINE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -505,7 +505,7 @@
   <varlistentry xml:id="constant.pgsql-diag-schema-name">
    <term>
     <constant>PGSQL_DIAG_SCHEMA_NAME</constant>
-    (<type>string</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -516,7 +516,7 @@
   <varlistentry xml:id="constant.pgsql-diag-table-name">
    <term>
     <constant>PGSQL_DIAG_TABLE_NAME</constant>
-    (<type>string</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -527,7 +527,7 @@
   <varlistentry xml:id="constant.pgsql-diag-column-name">
    <term>
     <constant>PGSQL_DIAG_COLUMN_NAME</constant>
-    (<type>string</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -538,7 +538,7 @@
   <varlistentry xml:id="constant.pgsql-diag-datatype-name">
    <term>
     <constant>PGSQL_DIAG_DATATYPE_NAME</constant>
-    (<type>string</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -549,7 +549,7 @@
   <varlistentry xml:id="constant.pgsql-diag-constraint-name">
    <term>
     <constant>PGSQL_DIAG_CONSTRAINT_NAME</constant>
-    (<type>string</type>)
+    (<type>int</type>)
    </term>
    <listitem>
     <simpara>
@@ -560,7 +560,7 @@
 
   <varlistentry xml:id="constant.pgsql-errors-terse">
    <term>
-    <constant>PGSQL_ERRORS_TERSE</constant> 
+    <constant>PGSQL_ERRORS_TERSE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -571,7 +571,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-errors-default">
    <term>
-    <constant>PGSQL_ERRORS_DEFAULT</constant> 
+    <constant>PGSQL_ERRORS_DEFAULT</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -582,7 +582,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-errors-verbose">
    <term>
-    <constant>PGSQL_ERRORS_VERBOSE</constant> 
+    <constant>PGSQL_ERRORS_VERBOSE</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -616,7 +616,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-notice-clear">
    <term>
-    <constant>PGSQL_NOTICE_CLEAR</constant> 
+    <constant>PGSQL_NOTICE_CLEAR</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -628,7 +628,7 @@
 
   <varlistentry xml:id="constant.pgsql-status-long">
    <term>
-    <constant>PGSQL_STATUS_LONG</constant> 
+    <constant>PGSQL_STATUS_LONG</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -639,7 +639,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-status-string">
    <term>
-    <constant>PGSQL_STATUS_STRING</constant> 
+    <constant>PGSQL_STATUS_STRING</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -651,7 +651,7 @@
 
   <varlistentry xml:id="constant.pgsql-conv-ignore-default">
    <term>
-    <constant>PGSQL_CONV_IGNORE_DEFAULT</constant> 
+    <constant>PGSQL_CONV_IGNORE_DEFAULT</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -662,7 +662,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-conv-force-null">
    <term>
-    <constant>PGSQL_CONV_FORCE_NULL</constant> 
+    <constant>PGSQL_CONV_FORCE_NULL</constant>
     (<type>int</type>)
    </term>
    <listitem>
@@ -673,7 +673,7 @@
   </varlistentry>
   <varlistentry xml:id="constant.pgsql-conv-ignore-not-null">
    <term>
-    <constant>PGSQL_CONV_IGNORE_NOT_NULL</constant> 
+    <constant>PGSQL_CONV_IGNORE_NOT_NULL</constant>
     (<type>int</type>)
    </term>
    <listitem>