Update, add mention of user locking table before MERGE:

bmomjian · bmomjian · commit 84bb3876bc6e · 2005-11-16T18:45:09.000Z
&lt;   so duplicate checking can be easily performed.
&gt;   so duplicate checking can be easily performed.  It is possible to
&gt;   do it without a unique index if we require the user to LOCK the table
&gt;   before the MERGE.
diff --git a/doc/TODO b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated:		Wed Nov 16 11:33:25 EST 2005
+Last updated:		Wed Nov 16 13:44:51 EST 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -373,7 +373,9 @@ SQL Commands
   triggers?)
 
   To implement this cleanly requires that the table have a unique index
-  so duplicate checking can be easily performed.
+  so duplicate checking can be easily performed.  It is possible to
+  do it without a unique index if we require the user to LOCK the table
+  before the MERGE.
 
 * Add NOVICE output level for helpful messages like automatic sequence/index
   creation
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
 <body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
 <h1><a name="section_1">PostgreSQL TODO List</a></h1>
 <p>Current maintainer:     Bruce Momjian (<a href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>)<br/>
-Last updated:           Wed Nov 16 11:33:25 EST 2005
+Last updated:           Wed Nov 16 13:44:51 EST 2005
 </p>
 <p>The most recent version of this document can be viewed at<br/>
 <a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a>.
@@ -342,7 +342,9 @@ <h1><a name="section_8">SQL Commands</a></h1>
   </li><li>Add MERGE command that does UPDATE/DELETE, or on failure, INSERT (rules,
   triggers?)
 <p>  To implement this cleanly requires that the table have a unique index
-  so duplicate checking can be easily performed.
+  so duplicate checking can be easily performed.  It is possible to
+  do it without a unique index if we require the user to LOCK the table
+  before the MERGE.
 </p>
   </li><li>Add NOVICE output level for helpful messages like automatic sequence/index
   creation
