From 9e555180f23dd4d1a85a8b2b93350358322a540a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 6 Nov 2020 16:17:57 -0500 Subject: Revert "Accept relations of any kind in LOCK TABLE". Revert 59ab4ac32, as well as the followup fix 33862cb9c, in all branches. We need to think a bit harder about what the behavior of LOCK TABLE on views should be, and there's no time for that before next week's releases. We'll take another crack at this later. Discussion: https://postgr.es/m/16703-e348f58aab3cf6cc@postgresql.org --- doc/src/sgml/ref/lock.sgml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index 9b33ddc637c..b946eab3039 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -16,7 +16,7 @@ PostgreSQL documentation LOCK - lock a named relation (table, etc) + lock a table @@ -34,9 +34,7 @@ LOCK [ TABLE ] [ ONLY ] name [ * ] Description - LOCK TABLE obtains a table-level lock on a - relation (table, partitioned table, foreign table, view, - materialized view, index, composite type, sequence), waiting + LOCK TABLE obtains a table-level lock, waiting if necessary for any conflicting locks to be released. If NOWAIT is specified, LOCK TABLE does not wait to acquire the desired lock: if it @@ -112,23 +110,17 @@ LOCK [ TABLE ] [ ONLY ] name [ * ] name - The name (optionally schema-qualified) of an existing relation to - lock. If ONLY is specified before a table name, only that - table is locked. If ONLY is not specified, the table and all - its descendant tables (if any) are locked. Optionally, * + The name (optionally schema-qualified) of an existing table to + lock. If ONLY is specified before the table name, only that + table is locked. If ONLY is not specified, the table and all + its descendant tables (if any) are locked. Optionally, * can be specified after the table name to explicitly indicate that descendant tables are included. - Locking a view locks only the view object itself, not any referenced - relations. (Note that this behavior is different - in PostgreSQL v11 and later.) - - - - The command LOCK TABLE a, b; is equivalent to - LOCK TABLE a; LOCK TABLE b;. The relations are locked + The command LOCK TABLE a, b; is equivalent to + LOCK TABLE a; LOCK TABLE b;. The tables are locked one-by-one in the order specified in the LOCK TABLE command. -- cgit v1.2.3