From: Robert Haas <rhaas@postgresql.org>
Date: Thu, 6 Sep 2012 21:00:03 +0000 (-0400)
Subject: Update syntax shown for \copy to match new syntax for COPY.
X-Git-Tag: REL9_3_BETA1~922
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dda589c96b89320446933108ca946e7e6b8eb9d2;p=postgresql

Update syntax shown for \copy to match new syntax for COPY.

Etsuro Fujita
---

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 0675a8e17b..c41593c5e3 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -830,18 +830,7 @@ testdb=&gt;
         <term><literal>\copy { <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column_list</replaceable> ) ] | ( <replaceable class="parameter">query</replaceable> ) }
         { <literal>from</literal> | <literal>to</literal> }
         { <replaceable class="parameter">filename</replaceable> | stdin | stdout | pstdin | pstdout }
-        [ with ]
-            [ binary ]
-            [ oids ]
-            [ delimiter [ as ] '<replaceable class="parameter">character</replaceable>' ]
-            [ null [ as ] '<replaceable class="parameter">string</replaceable>' ]
-            [ csv
-              [ header ]
-              [ quote [ as ] '<replaceable class="parameter">character</replaceable>' ]
-              [ escape [ as ] '<replaceable class="parameter">character</replaceable>' ]
-              [ force quote <replaceable class="parameter">column_list</replaceable> | * ]
-              [ force not null <replaceable class="parameter">column_list</replaceable> ] ]</literal>
-        </term>
+        [ [ with ] ( <replaceable class="parameter">option</replaceable> [, ...] ) ]</literal></term>
 
         <listitem>
         <para>
@@ -859,7 +848,11 @@ testdb=&gt;
         <para>
         The syntax of the command is similar to that of the
         <acronym>SQL</acronym> <xref linkend="sql-copy">
-        command.  Note that, because of this,
+        command, and
+        <replaceable class="parameter">option</replaceable>
+        must indicate one of the options of the
+        <acronym>SQL</acronym> <xref linkend="sql-copy"> command.
+        Note that, because of this,
         special parsing rules apply to the <command>\copy</command>
         command. In particular, the variable substitution rules and
         backslash escapes do not apply.