From ebe124eacd7c3faa36ed358e7cc1d7c5b419e5f6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 14:18:09 +0200 Subject: Merging upstream version 15.6. Signed-off-by: Daniel Baumann --- doc/src/sgml/ref/alter_event_trigger.sgml | 2 +- doc/src/sgml/ref/alter_foreign_data_wrapper.sgml | 2 +- doc/src/sgml/ref/copy.sgml | 8 ++++---- doc/src/sgml/ref/create_table.sgml | 19 +++++++++++++------ doc/src/sgml/ref/merge.sgml | 14 +++++++------- doc/src/sgml/ref/select.sgml | 3 +-- 6 files changed, 27 insertions(+), 21 deletions(-) (limited to 'doc/src/sgml/ref') diff --git a/doc/src/sgml/ref/alter_event_trigger.sgml b/doc/src/sgml/ref/alter_event_trigger.sgml index ef5253b..139d74e 100644 --- a/doc/src/sgml/ref/alter_event_trigger.sgml +++ b/doc/src/sgml/ref/alter_event_trigger.sgml @@ -73,7 +73,7 @@ ALTER EVENT TRIGGER name RENAME TO - DISABLE/ENABLE [ REPLICA | ALWAYS ] TRIGGER + DISABLE/ENABLE [ REPLICA | ALWAYS ] These forms configure the firing of event triggers. A disabled trigger diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml index 54f34c2..dc0957d 100644 --- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml @@ -153,7 +153,7 @@ ALTER FOREIGN DATA WRAPPER name REN Change a foreign-data wrapper dbi, add option foo, drop bar: -ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar'); +ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP bar); diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 63afa0d..51ce759 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -127,10 +127,10 @@ COPY { table_name [ ( For INSERT, UPDATE and - DELETE queries a RETURNING clause must be provided, - and the target relation must not have a conditional rule, nor - an ALSO rule, nor an INSTEAD rule - that expands to multiple statements. + DELETE queries a RETURNING clause + must be provided, and the target relation must not have a conditional + rule, nor an ALSO rule, nor an + INSTEAD rule that expands to multiple statements. diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index c1b6beb..0301dff 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1108,10 +1108,11 @@ WITH ( MODULUS numeric_literal, REM column(s) of some row of the referenced table. If the refcolumn list is omitted, the primary key of the reftable - is used. The referenced columns must be the columns of a non-deferrable - unique or primary key constraint in the referenced table. The user - must have REFERENCES permission on the referenced table - (either the whole table, or the specific referenced columns). The + is used. Otherwise, the refcolumn + list must refer to the columns of a non-deferrable unique or primary key + constraint or be the columns of a non-partial unique index. The user + must have REFERENCES permission on the referenced + table (either the whole table, or the specific referenced columns). The addition of a foreign key constraint requires a SHARE ROW EXCLUSIVE lock on the referenced table. Note that foreign key constraints cannot be defined between temporary @@ -2248,13 +2249,19 @@ CREATE TABLE cities_partdef - Foreign-Key Constraint Actions + Foreign Key Constraints - The ability to specify column lists in the foreign-key actions + The ability to specify column lists in the foreign key actions SET DEFAULT and SET NULL is a PostgreSQL extension. + + + It is a PostgreSQL extension that a + foreign key constraint may reference columns of a unique index instead of + columns of a primary key or unique constraint. + diff --git a/doc/src/sgml/ref/merge.sgml b/doc/src/sgml/ref/merge.sgml index 0995fe0..f643e62 100644 --- a/doc/src/sgml/ref/merge.sgml +++ b/doc/src/sgml/ref/merge.sgml @@ -102,14 +102,14 @@ DELETE that are referred to in the SET clause. If you specify an insert action, you must have the INSERT privilege on the target_table_name. - If you specify an delete action, you must have the DELETE + If you specify a delete action, you must have the DELETE privilege on the target_table_name. Privileges are tested once at statement start and are checked whether or not particular WHEN clauses are executed. - You will require the SELECT privilege on the - data_source and any column(s) - of the target_table_name - referred to in a condition. + You will require the SELECT privilege on any column(s) + of the data_source and + target_table_name referred to + in any condition or expression. @@ -627,8 +627,8 @@ WHEN MATCHED THEN This command conforms to the SQL standard. - The WITH clause and DO NOTHING action are extensions to - the SQL standard. + The WITH clause and DO NOTHING + action are extensions to the SQL standard. diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 5df0d89..69056a8 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1918,8 +1918,7 @@ WITH t AS ( ) SELECT * FROM t UNION ALL -SELECT * FROM t - +SELECT * FROM t; x -------------------- 0.534150459803641 -- cgit v1.2.3