summaryrefslogtreecommitdiffstats
path: root/doc/src/sgml/ref
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/src/sgml/ref/alter_event_trigger.sgml2
-rw-r--r--doc/src/sgml/ref/alter_foreign_data_wrapper.sgml2
-rw-r--r--doc/src/sgml/ref/copy.sgml8
-rw-r--r--doc/src/sgml/ref/create_table.sgml19
-rw-r--r--doc/src/sgml/ref/merge.sgml14
-rw-r--r--doc/src/sgml/ref/select.sgml3
6 files changed, 27 insertions, 21 deletions
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 <replaceable class="parameter">name</replaceable> RENAME TO
</varlistentry>
<varlistentry>
- <term><literal>DISABLE</literal>/<literal>ENABLE [ REPLICA | ALWAYS ] TRIGGER</literal></term>
+ <term><literal>DISABLE</literal>/<literal>ENABLE [ REPLICA | ALWAYS ]</literal></term>
<listitem>
<para>
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 <replaceable class="parameter">name</replaceable> REN
Change a foreign-data wrapper <literal>dbi</literal>, add
option <literal>foo</literal>, drop <literal>bar</literal>:
<programlisting>
-ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar');
+ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP bar);
</programlisting>
</para>
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 { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
</para>
<para>
For <command>INSERT</command>, <command>UPDATE</command> and
- <command>DELETE</command> queries a RETURNING clause must be provided,
- and the target relation must not have a conditional rule, nor
- an <literal>ALSO</literal> rule, nor an <literal>INSTEAD</literal> rule
- that expands to multiple statements.
+ <command>DELETE</command> queries a <literal>RETURNING</literal> clause
+ must be provided, and the target relation must not have a conditional
+ rule, nor an <literal>ALSO</literal> rule, nor an
+ <literal>INSTEAD</literal> rule that expands to multiple statements.
</para>
</listitem>
</varlistentry>
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 <replaceable class="parameter">numeric_literal</replaceable>, REM
column(s) of some row of the referenced table. If the <replaceable
class="parameter">refcolumn</replaceable> list is omitted, the
primary key of the <replaceable class="parameter">reftable</replaceable>
- 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 <literal>REFERENCES</literal> permission on the referenced table
- (either the whole table, or the specific referenced columns). The
+ is used. Otherwise, the <replaceable class="parameter">refcolumn</replaceable>
+ 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 <literal>REFERENCES</literal> permission on the referenced
+ table (either the whole table, or the specific referenced columns). The
addition of a foreign key constraint requires a
<literal>SHARE ROW EXCLUSIVE</literal> lock on the referenced table.
Note that foreign key constraints cannot be defined between temporary
@@ -2248,13 +2249,19 @@ CREATE TABLE cities_partdef
</refsect2>
<refsect2>
- <title>Foreign-Key Constraint Actions</title>
+ <title>Foreign Key Constraints</title>
<para>
- The ability to specify column lists in the foreign-key actions
+ The ability to specify column lists in the foreign key actions
<literal>SET DEFAULT</literal> and <literal>SET NULL</literal> is a
<productname>PostgreSQL</productname> extension.
</para>
+
+ <para>
+ It is a <productname>PostgreSQL</productname> extension that a
+ foreign key constraint may reference columns of a unique index instead of
+ columns of a primary key or unique constraint.
+ </para>
</refsect2>
<refsect2>
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 <literal>SET</literal> clause.
If you specify an insert action, you must have the <literal>INSERT</literal>
privilege on the <replaceable class="parameter">target_table_name</replaceable>.
- If you specify an delete action, you must have the <literal>DELETE</literal>
+ If you specify a delete action, you must have the <literal>DELETE</literal>
privilege on the <replaceable class="parameter">target_table_name</replaceable>.
Privileges are tested once at statement start and are checked
whether or not particular <literal>WHEN</literal> clauses are executed.
- You will require the <literal>SELECT</literal> privilege on the
- <replaceable class="parameter">data_source</replaceable> and any column(s)
- of the <replaceable class="parameter">target_table_name</replaceable>
- referred to in a <literal>condition</literal>.
+ You will require the <literal>SELECT</literal> privilege on any column(s)
+ of the <replaceable class="parameter">data_source</replaceable> and
+ <replaceable class="parameter">target_table_name</replaceable> referred to
+ in any <literal>condition</literal> or <literal>expression</literal>.
</para>
<para>
@@ -627,8 +627,8 @@ WHEN MATCHED THEN
This command conforms to the <acronym>SQL</acronym> standard.
</para>
<para>
- The WITH clause and <literal>DO NOTHING</literal> action are extensions to
- the <acronym>SQL</acronym> standard.
+ The <literal>WITH</literal> clause and <literal>DO NOTHING</literal>
+ action are extensions to the <acronym>SQL</acronym> standard.
</para>
</refsect1>
</refentry>
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