From 4b9904a0f81c4755ac5b2cf0403bfd3e7acec95c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 24 May 2010 17:43:39 +0000
Subject: [PATCH] Update pg_upgrade docs to show options in alphabetical order,
and improve 8.3 doc limitations paragraph.
---
doc/src/sgml/pgupgrade.sgml | 61 +++++++++++++++++++------------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index d53a32df5d9..0b9b5c3cc99 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgupgrade.sgml,v 1.9 2010/05/19 20:47:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgupgrade.sgml,v 1.10 2010/05/24 17:43:39 momjian Exp $ -->
<sect1 id="pgupgrade">
<title>pg_upgrade</title>
@@ -35,18 +35,6 @@
<variablelist>
- <varlistentry>
- <term><option>-d</option> <replaceable>OLDDATADIR</></term>
- <term><option>--old-datadir</option> <replaceable>OLDDATADIR</></term>
- <listitem><para>specify the old cluster data directory</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-D</option> <replaceable>NEWDATADIR</></term>
- <term><option>--new-datadir</option> <replaceable>NEWDATADIR</></term>
- <listitem><para>specify the new cluster data directory</para></listitem>
- </varlistentry>
-
<varlistentry>
<term><option>-b</option> <replaceable>OLDBINDIR</></term>
<term><option>--old-bindir</option> <replaceable>OLDBINDIR</></term>
@@ -60,31 +48,25 @@
</varlistentry>
<varlistentry>
- <term><option>-p</option> <replaceable>portnum</></term>
- <term><option>--old-port</option> <replaceable>portnum</></term>
- <listitem><para>specify the old cluster port number</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-P</option> <replaceable>portnum</></term>
- <term><option>--new-port</option> <replaceable>portnum</></term>
- <listitem><para>specify the new cluster port number</para></listitem>
+ <term><option>-c</option></term>
+ <term><option>--check</option></term>
+ <listitem><para>check clusters only, don't change any data</para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-u</option> <replaceable>username</></term>
- <term><option>--user</option> <replaceable>username</></term>
- <listitem><para>clusters superuser</para></listitem>
+ <term><option>-d</option> <replaceable>OLDDATADIR</></term>
+ <term><option>--old-datadir</option> <replaceable>OLDDATADIR</></term>
+ <listitem><para>specify the old cluster data directory</para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-c</option></term>
- <term><option>--check</option></term>
- <listitem><para>check clusters only, don't change any data</para></listitem>
+ <term><option>-D</option> <replaceable>NEWDATADIR</></term>
+ <term><option>--new-datadir</option> <replaceable>NEWDATADIR</></term>
+ <listitem><para>specify the new cluster data directory</para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-d</option></term>
+ <term><option>-g</option></term>
<term><option>--debug</option></term>
<listitem><para>enable debugging</para></listitem>
</varlistentry>
@@ -107,6 +89,24 @@
<listitem><para>log session activity to file</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>-p</option> <replaceable>portnum</></term>
+ <term><option>--old-port</option> <replaceable>portnum</></term>
+ <listitem><para>specify the old cluster port number</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-P</option> <replaceable>portnum</></term>
+ <term><option>--new-port</option> <replaceable>portnum</></term>
+ <listitem><para>specify the new cluster port number</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-u</option> <replaceable>username</></term>
+ <term><option>--user</option> <replaceable>username</></term>
+ <listitem><para>clusters superuser</para></listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>-v</option></term>
<term><option>--verbose</option></term>
@@ -120,6 +120,7 @@
</varlistentry>
<varlistentry>
+ <term><option>-?</option></term>
<term><option>-h</option></term>
<term><option>--help</option></term>
<listitem><para>show help, then exit</para></listitem>
@@ -441,6 +442,8 @@ psql --username postgres --file script.sql postgres
<para>
+ Upgrading from PostgreSQL 8.3 has additional restrictions not present
+ when upgrading from later PostgreSQL releases. For example,
pg_upgrade will not work for a migration from 8.3 if a user column
is defined as:
<itemizedlist>
--
GitLab