diff options
| author | Andres Freund | 2015-05-08 16:00:01 +0000 |
|---|---|---|
| committer | Andres Freund | 2015-05-08 17:24:14 +0000 |
| commit | e8898e9169c851c2b8c98f981c1c4755a5758f8e (patch) | |
| tree | 58f806e29a38e17e49838da4fa7d8c73dd8f996e /doc | |
| parent | 53bb309d2d5a9432d2602c93ed18e58bd2924e15 (diff) | |
Minor ON CONFLICT related comments and doc fixes.
Geoff Winkless, Stephen Frost, Peter Geoghegan and me.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/sgml/ref/insert.sgml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index c88d1b7b50a..eff52cb1e0c 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -76,7 +76,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <para> <literal>ON CONFLICT</> can be used to specify an alternative action to raising a unique constraint or exclusion constraint - violation error . (See <xref linkend="sql-on-conflict" + violation error. (See <xref linkend="sql-on-conflict" endterm="sql-on-conflict-title"> below.) </para> @@ -397,7 +397,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac <emphasis>unique index inference</emphasis> clause or an explicitly named constraint can be used. For <literal>ON CONFLICT DO NOTHING</literal>, it is optional to specify a - <parameter>conflict_target</parameter>; when ommitted, conflicts + <parameter>conflict_target</parameter>; when omitted, conflicts with all usable constraints (and unique indexes) are handled. For <literal>ON CONFLICT DO UPDATE</literal>, a conflict target <emphasis>must</emphasis> be specified. |