aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2020-11-06 16:17:57 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2020-11-06 16:17:57 -0500
commit549fd3d3bc24d40d8c577231eb82ebc7b93c1201 (patch)
tree9ae0c0059338cc69dc0de8ba420cca4448a3da5e /doc/src
parent802c460a27cc1d01f8c8b9542488bbdfde60dc58 (diff)
downloadpostgresql-549fd3d3bc24d40d8c577231eb82ebc7b93c1201.tar.gz
postgresql-549fd3d3bc24d40d8c577231eb82ebc7b93c1201.zip
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
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/ref/lock.sgml15
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 10f1427f9f1..a225cea63b2 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -16,7 +16,7 @@ PostgreSQL documentation
<refnamediv>
<refname>LOCK</refname>
- <refpurpose>lock a named relation (table, etc)</refpurpose>
+ <refpurpose>lock a table</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -34,9 +34,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
<title>Description</title>
<para>
- <command>LOCK TABLE</command> obtains a table-level lock on a
- relation (table, partitioned table, foreign table, view,
- materialized view, index, composite type, sequence), waiting
+ <command>LOCK TABLE</command> obtains a table-level lock, waiting
if necessary for any conflicting locks to be released. If
<literal>NOWAIT</literal> is specified, <command>LOCK
TABLE</command> does not wait to acquire the desired lock: if it
@@ -117,18 +115,17 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
<term><replaceable class="parameter">name</replaceable></term>
<listitem>
<para>
- The name (optionally schema-qualified) of an existing relation to
- lock. If <literal>ONLY</literal> is specified before a table name, only that
+ The name (optionally schema-qualified) of an existing table to
+ lock. If <literal>ONLY</literal> is specified before the table name, only that
table is locked. If <literal>ONLY</literal> is not specified, the table and all
its descendant tables (if any) are locked. Optionally, <literal>*</literal>
can be specified after the table name to explicitly indicate that
- descendant tables are included. When locking a view, all relations appearing
- in the view definition are locked, regardless of <literal>ONLY</literal>.
+ descendant tables are included.
</para>
<para>
The command <literal>LOCK TABLE a, b;</literal> is equivalent to
- <literal>LOCK TABLE a; LOCK TABLE b;</literal>. The relations are locked
+ <literal>LOCK TABLE a; LOCK TABLE b;</literal>. The tables are locked
one-by-one in the order specified in the <command>LOCK
TABLE</command> command.
</para>