summaryrefslogtreecommitdiff
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
commitec516818a81aa43c56eb433e9c47304c19f4ac1b (patch)
tree3610d4a8babc385f93ffb43128eba95488bd0f9a /doc/src
parentdee1fe5e339acdb12f187e568b5363663cea42d7 (diff)
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.sgml24
1 files changed, 8 insertions, 16 deletions
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
<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
@@ -112,23 +110,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
- table is locked. If <literal>ONLY</literal> is not specified, the table and all
- its descendant tables (if any) are locked. Optionally, <literal>*</literal>
+ The name (optionally schema-qualified) of an existing table to
+ lock. If <literal>ONLY</> is specified before the table name, only that
+ table is locked. If <literal>ONLY</> is not specified, the table and all
+ its descendant tables (if any) are locked. Optionally, <literal>*</>
can be specified after the table name to explicitly indicate that
descendant tables are included.
</para>
<para>
- Locking a view locks only the view object itself, not any referenced
- relations. (Note that this behavior is different
- in <productname>PostgreSQL</productname> v11 and later.)
- </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
+ The command <literal>LOCK TABLE a, b;</> is equivalent to
+ <literal>LOCK TABLE a; LOCK TABLE b;</>. The tables are locked
one-by-one in the order specified in the <command>LOCK
TABLE</command> command.
</para>