From dbefa96f8ea0e112c34e9317734dd8a303595e6a Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 16 Oct 2019 13:10:31 +0900 Subject: [PATCH] Doc: Fix various inconsistencies 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 --- doc/src/sgml/extend.sgml | 2 +- doc/src/sgml/ref/copy.sgml | 24 ++++++++++++------------ doc/src/sgml/ref/prepare.sgml | 2 +- doc/src/sgml/ref/set_role.sgml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index 8dc2b893f7..a3046f22d0 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -856,7 +856,7 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr dynamically from one version to the next, you should provide update scripts that make the necessary changes to go from one version to the next. Update scripts have names following the pattern - extension--oldversion--newversion.sql + extension--old_version--target_version.sql (for example, foo--1.0--1.1.sql contains the commands to modify version 1.0 of extension foo into version 1.1). diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 5e2992ddac..3e6f9cd532 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1015,22 +1015,22 @@ COPY table_name [ ( filename' | STDIN } [ [ WITH ] [ BINARY ] - [ DELIMITER [ AS ] 'delimiter' ] - [ NULL [ AS ] 'null string' ] + [ DELIMITER [ AS ] 'delimiter_character' ] + [ NULL [ AS ] 'null_string' ] [ CSV [ HEADER ] - [ QUOTE [ AS ] 'quote' ] - [ ESCAPE [ AS ] 'escape' ] + [ QUOTE [ AS ] 'quote_character' ] + [ ESCAPE [ AS ] 'escape_character' ] [ FORCE NOT NULL column_name [, ...] ] ] ] COPY { table_name [ ( column_name [, ...] ) ] | ( query ) } TO { 'filename' | STDOUT } [ [ WITH ] [ BINARY ] - [ DELIMITER [ AS ] 'delimiter' ] - [ NULL [ AS ] 'null string' ] + [ DELIMITER [ AS ] 'delimiter_character' ] + [ NULL [ AS ] 'null_string' ] [ CSV [ HEADER ] - [ QUOTE [ AS ] 'quote' ] - [ ESCAPE [ AS ] 'escape' ] + [ QUOTE [ AS ] 'quote_character' ] + [ ESCAPE [ AS ] 'escape_character' ] [ FORCE QUOTE { column_name [, ...] | * } ] ] ] @@ -1046,13 +1046,13 @@ COPY { table_name [ ( COPY [ BINARY ] table_name FROM { 'filename' | STDIN } - [ [USING] DELIMITERS 'delimiter' ] - [ WITH NULL AS 'null string' ] + [ [USING] DELIMITERS 'delimiter_character' ] + [ WITH NULL AS 'null_string' ] COPY [ BINARY ] table_name TO { 'filename' | STDOUT } - [ [USING] DELIMITERS 'delimiter' ] - [ WITH NULL AS 'null string' ] + [ [USING] DELIMITERS 'delimiter_character' ] + [ WITH NULL AS 'null_string' ] diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index 9f786cd3ad..4e5e96a401 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -165,7 +165,7 @@ PREPARE name [ ( PostgreSQL is using for a prepared statement, use , for example -EXPLAIN EXECUTE stmt_name(parameter_values); +EXPLAIN EXECUTE name(parameter_values); If a generic plan is in use, it will contain parameter symbols $n, while a custom plan diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 9ab0d6af04..a4842f363c 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -64,7 +64,7 @@ RESET ROLE Using this command, it is possible to either add privileges or restrict - one's privileges. If the session user role has the INHERITS + one's privileges. If the session user role has the INHERIT attribute, then it automatically has all the privileges of every role that it could SET ROLE to; in this case SET ROLE effectively drops all the privileges assigned directly to the session user