database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Doc: Fix various inconsistencies

Browse Source 
This fixes multiple areas of the documentation:
- COPY for its past compatibility section.
- SET ROLE mentioning INHERITS instead of INHERIT
- PREPARE referring to stmt_name, that is not present.
- Extension documentation about format name with upgrade scripts.

Backpatch down to 9.4 for the relevant parts.

Author: Alexander Lakhin
Discussion: https://postgr.es/m/bf95233a-9943-b341-e2ff-a860c28af481@gmail.com
Backpatch-through: 9.4
This commit is contained in:
Michael Paquier
2019-10-16 13:09:52 +09:00
parent cef82eda14
commit 4351142e58
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doc/src/sgml/ref/copy.sgml
View File

@@ -1015,22 +1015,22 @@ COPY <replaceable class="parameter">table_name</replaceable> [ ( <replaceable cl
FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
[ [ WITH ]
[ BINARY ]
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
[ NULL [ AS ] '<replaceable class="parameter">null_string</replaceable>' ]
[ CSV [ HEADER ]
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
[ FORCE NOT NULL <replaceable class="parameter">column_name</replaceable> [, ...] ] ] ]
COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ] | ( <replaceable class="parameter">query</replaceable> ) }
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
[ [ WITH ]
[ BINARY ]
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter</replaceable>' ]
[ NULL [ AS ] '<replaceable class="parameter">null string</replaceable>' ]
[ DELIMITER [ AS ] '<replaceable class="parameter">delimiter_character</replaceable>' ]
[ NULL [ AS ] '<replaceable class="parameter">null_string</replaceable>' ]
[ CSV [ HEADER ]
[ QUOTE [ AS ] '<replaceable class="parameter">quote</replaceable>' ]
[ ESCAPE [ AS ] '<replaceable class="parameter">escape</replaceable>' ]
[ QUOTE [ AS ] '<replaceable class="parameter">quote_character</replaceable>' ]
[ ESCAPE [ AS ] '<replaceable class="parameter">escape_character</replaceable>' ]
[ FORCE QUOTE { <replaceable class="parameter">column_name</replaceable> [, ...] | * } ] ] ]
</synopsis>
@@ -1046,13 +1046,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
<synopsis>
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable>
FROM { '<replaceable class="parameter">filename</replaceable>' | STDIN }
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
COPY [ BINARY ] <replaceable class="parameter">table_name</replaceable>
TO { '<replaceable class="parameter">filename</replaceable>' | STDOUT }
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter</replaceable>' ]
[ WITH NULL AS '<replaceable class="parameter">null string</replaceable>' ]
[ [USING] DELIMITERS '<replaceable class="parameter">delimiter_character</replaceable>' ]
[ WITH NULL AS '<replaceable class="parameter">null_string</replaceable>' ]
</synopsis></para>
</refsect1>
</refentry>