Commite8898e9

committed

Minor ON CONFLICT related comments and doc fixes.

Geoff Winkless, Stephen Frost, Peter Geoghegan and me.

1 parent53bb309 commite8898e9Copy full SHA for e8898e9

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac`
`76`	`76`	`<para>`
`77`	`77`	`<literal>ON CONFLICT</> can be used to specify an alternative`
`78`	`78`	`action to raising a unique constraint or exclusion constraint`
`79`		`- violation error. (See <xref linkend="sql-on-conflict"`
	`79`	`+ violation error. (See <xref linkend="sql-on-conflict"`
`80`	`80`	`endterm="sql-on-conflict-title"> below.)`
`81`	`81`	`</para>`
`82`	`82`
`@@ -397,7 +397,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac`
`397`	`397`	`<emphasis>unique index inference</emphasis> clause or an explicitly`
`398`	`398`	`named constraint can be used. For <literal>ON CONFLICT DO`
`399`	`399`	`NOTHING</literal>, it is optional to specify a`
`400`		`- <parameter>conflict_target</parameter>; whenommitted, conflicts`
	`400`	`+ <parameter>conflict_target</parameter>; whenomitted, conflicts`
`401`	`401`	`with all usable constraints (and unique indexes) are handled. For`
`402`	`402`	`<literal>ON CONFLICT DO UPDATE</literal>, a conflict target`
`403`	`403`	`<emphasis>must</emphasis> be specified.`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2068,10 +2068,10 @@ FreeBulkInsertState(BulkInsertState bistate)`
`2068`	`2068`	`* Speculatively inserted tuples behave as "value locks" of short duration,`
`2069`	`2069`	`* used to implement INSERT .. ON CONFLICT.`
`2070`	`2070`	`*`
`2071`		`- * Note that these options will be applied when inserting into the heap's`
`2072`		`- * TOAST table, too, if the tuple requires any out-of-line data.`
`2073`		`- *FIXME: Do we mark TOAST tuplesasspeculative too? What about confirming`
`2074`		`- *or aborting them?`
	`2071`	`+ * Note thatmost ofthese options will be applied when inserting into the`
	`2072`	`+ *heap'sTOAST table, too, if the tuple requires any out-of-line data. Only`
	`2073`	`+ *HEAP_INSERT_IS_SPECULATIVE is explicitly ignored,asthe toast data does`
	`2074`	`+ *not partake in speculative insertion.`
`2075`	`2075`	`*`
`2076`	`2076`	`* The BulkInsertState object (if any; bistate can be NULL for default`
`2077`	`2077`	`* behavior) is also just passed through to RelationGetBufferForTuple.`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,10 @@ intSessionReplicationRole = SESSION_REPLICATION_ROLE_ORIGIN;`
`66`	`66`	`staticintMyTriggerDepth=0;`
`67`	`67`
`68`	`68`	`/*`
`69`		`- * Note that similar macros alsoexists in executor/execMain.c. There does not`
`70`		`- * appear to be any good header to putit into, given the structures that it`
`71`		`- *uses, so we let them be duplicated. Be sure to updateboth if one needs to`
`72`		`- * be changed, however.`
	`69`	`+ * Note that similar macros alsoexist in executor/execMain.c. There does not`
	`70`	`+ * appear to be any good header to putthem into, given the structures that`
	`71`	`+ *they use, so we let them be duplicated. Be sure to updateall if one needs`
	`72`	`+ *tobe changed, however.`
`73`	`73`	`*/`
`74`	`74`	`#defineGetUpdatedColumns(relinfo,estate) \`
`75`	`75`	`(rt_fetch((relinfo)->ri_RangeTableIndex, (estate)->es_range_table)->updatedCols)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,7 @@ typedef struct ModifyTableState`
`1108`	`1108`	`Listmt_arbiterindexes;/ unique index OIDs to arbitrate taking alt path */`
`1109`	`1109`	`TupleTableSlotmt_existing;/ slot to store existing target tuple in */`
`1110`	`1110`	`Listmt_excludedtlist;/ the excluded pseudo relation's tlist */`
`1111`		`-TupleTableSlotmt_conflproj;/ FIXME*/`
	`1111`	`+TupleTableSlotmt_conflproj;/CONFLICT ... SET ... projection target*/`
`1112`	`1112`	`}ModifyTableState;`
`1113`	`1113`
`1114`	`1114`	`/* ----------------`

Comments

(0)