From e8898e9169c851c2b8c98f981c1c4755a5758f8e Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Fri, 8 May 2015 18:00:01 +0200 Subject: Minor ON CONFLICT related comments and doc fixes. Geoff Winkless, Stephen Frost, Peter Geoghegan and me. --- doc/src/sgml/ref/insert.sgml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc/src') 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 table_name [ AS ON CONFLICT can be used to specify an alternative action to raising a unique constraint or exclusion constraint - violation error . (See below.) @@ -397,7 +397,7 @@ INSERT INTO table_name [ AS unique index inference clause or an explicitly named constraint can be used. For ON CONFLICT DO NOTHING, it is optional to specify a - conflict_target; when ommitted, conflicts + conflict_target; when omitted, conflicts with all usable constraints (and unique indexes) are handled. For ON CONFLICT DO UPDATE, a conflict target must be specified. -- cgit v1.2.3