Skip to content

Commit 1fd0eee

Browse files
bmomjianbmomjian
committed
doc: adjust UPDATE/DELETE's FROM/USING to match SELECT's FROM
Previously the syntax and wording were unclear. Reported-by: Alexey Bashtanov Discussion: https://postgr.es/m/968d4724-8e58-788f-7c45-f7b1813824cc@imap.cc Backpatch-through: 9.5
1 parent 297a174 commit 1fd0eee

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎doc/src/sgml/ref/delete.sgml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PostgreSQL documentation
2323
<synopsis>
2424
[ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
2525
DELETE FROM [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
26-
[ USING <replaceable class="parameter">using_list</replaceable> ]
26+
[ USING <replaceable class="parameter">from_item</replaceable> [, ...] ]
2727
[ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
2828
[ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
2929
</synopsis>
@@ -117,17 +117,17 @@ DELETE FROM [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ *
117117
</varlistentry>
118118

119119
<varlistentry>
120-
<term><replaceable class="parameter">using_list</replaceable></term>
120+
<term><replaceable class="parameter">from_item</replaceable></term>
121121
<listitem>
122122
<para>
123-
A list of table expressions, allowing columns from other tables
124-
to appear in the <literal>WHERE</literal> condition. This is similar
125-
to the list of tables that can be specified in the <xref
126-
linkend="sql-from" endterm="sql-from-title"/> of a
127-
<command>SELECT</command> statement; for example, an alias for
128-
the table name can be specified. Do not repeat the target table
129-
in the <replaceable class="parameter">using_list</replaceable>,
130-
unless you wish to set up a self-join.
123+
A table expression allowing columns from other tables to appear
124+
in the <literal>WHERE</literal> condition. This uses the same
125+
syntax as the <xref linkend="sql-from" endterm="sql-from-title"/>
126+
of a <command>SELECT</command> statement; for example, an alias
127+
for the table name can be specified. Do not repeat the target
128+
table as a <replaceable class="parameter">from_item</replaceable>
129+
unless you wish to set up a self-join (in which case it must appear
130+
with an alias in the <replaceable>from_item</replaceable>).
131131
</para>
132132
</listitem>
133133
</varlistentry>

‎doc/src/sgml/ref/update.sgml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [
2727
( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) |
2828
( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> )
2929
} [, ...]
30-
[ FROM <replaceable class="parameter">from_list</replaceable> ]
30+
[ FROM <replaceable class="parameter">from_item</replaceable> [, ...] ]
3131
[ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
3232
[ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
3333
</synopsis>
@@ -164,17 +164,17 @@ UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [
164164
</varlistentry>
165165

166166
<varlistentry>
167-
<term><replaceable class="parameter">from_list</replaceable></term>
167+
<term><replaceable class="parameter">from_item</replaceable></term>
168168
<listitem>
169169
<para>
170-
A list of table expressions, allowing columns from other tables
171-
to appear in the <literal>WHERE</literal> condition and the update
172-
expressions. This is similar to the list of tables that can be
173-
specified in the <xref linkend="sql-from"
174-
endterm="sql-from-title"/> of a <command>SELECT</command>
175-
statement. Note that the target table must not appear in the
176-
<replaceable>from_list</replaceable>, unless you intend a self-join (in which
177-
case it must appear with an alias in the <replaceable>from_list</replaceable>).
170+
A table expression allowing columns from other tables to appear in
171+
the <literal>WHERE</literal> condition and update expressions. This
172+
uses the same syntax as the <xref linkend="sql-from"
173+
endterm="sql-from-title"/> of a <command>SELECT</command> statement;
174+
for example, an alias for the table name can be specified. Do not
175+
repeat the target table as a <replaceable>from_item</replaceable>
176+
unless you intend a self-join (in which case it must appear with
177+
an alias in the <replaceable>from_item</replaceable>).
178178
</para>
179179
</listitem>
180180
</varlistentry>
@@ -264,7 +264,7 @@ UPDATE <replaceable class="parameter">count</replaceable>
264264
<para>
265265
When a <literal>FROM</literal> clause is present, what essentially happens
266266
is that the target table is joined to the tables mentioned in the
267-
<replaceable>from_list</replaceable>, and each output row of the join
267+
<replaceable>from_item</replaceable> list, and each output row of the join
268268
represents an update operation for the target table. When using
269269
<literal>FROM</literal> you should ensure that the join
270270
produces at most one output row for each row to be modified. In

0 commit comments

Comments
 (0)