From c0e5df9b2595eef89a756e76d742fc06b3469524 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 16 Oct 2019 13:10:49 +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 | 20 ++++++++++---------- doc/src/sgml/ref/set_role.sgml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index aaaea6bb55..2e3b5f678e 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -825,7 +825,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 3054123b7f..bdc4ae6da9 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -997,11 +997,11 @@ COPY table_name [ ( delimiter' ] + [ 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 ) } @@ -1009,11 +1009,11 @@ COPY { table_name [ ( delimiter' ] + [ 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 [, ...] | * } ] ] ] @@ -1029,13 +1029,13 @@ COPY { table_name [ ( COPY [ BINARY ] table_name [ WITH OIDS ] FROM { 'filename' | STDIN } - [ [USING] DELIMITERS 'delimiter' ] - [ WITH NULL AS 'null string' ] + [ [USING] DELIMITERS 'delimiter_character' ] + [ WITH NULL AS 'null_string' ] COPY [ BINARY ] table_name [ WITH OIDS ] 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/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 6f2843ada1..b346adb2d4 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 -- 2.40.0