Add MERGE TODO.detail:

>   [merge]
378a380
>   [merge]

diff --git a/doc/TODO b/doc/TODO
index ec8b12abe5ccb34e072628f7c00d87e8ef96f678..22c6e3c4614de55d5af86a5b3c2981c1f1160f72 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:    Bruce Momjian ([email protected])
-Last updated:      Thu Dec  1 17:07:44 EST 2005
+Last updated:      Thu Dec  1 17:12:27 EST 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -370,12 +370,14 @@ SQL Commands
 
 * Add a GUC variable to warn about non-standard SQL usage in queries
 * Add SQL-standard MERGE command, typically used to merge two tables
+  [merge]
 
   This is similar to UPDATE, then for unmatched rows, INSERT.
   Whether concurrent access allows modifications which could cause
   row loss is implementation independent.
 
 * Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT
+  [merge]
 
   To implement this cleanly requires that the table have a unique index
   so duplicate checking can be easily performed.  It is possible to

diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 6b00a6b1dba3184788eff65ba561ec7089574d8f..7bb7cd28420c23329a310da42f67ed15118eca1d 100644 (file)
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
 
 PostgreSQL TODO List
 Current maintainer:     Bruce Momjian ([email protected])
-Last updated:           Thu Dec  1 17:07:44 EST 2005
+Last updated:           Thu Dec  1 17:12:27 EST 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -340,11 +340,13 @@ first.
 
   Add a GUC variable to warn about non-standard SQL usage in queries
   Add SQL-standard MERGE command, typically used to merge two tables
+  [merge]
   This is similar to UPDATE, then for unmatched rows, INSERT.
   Whether concurrent access allows modifications which could cause
   row loss is implementation independent.
 
   Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT
+  [merge]
   To implement this cleanly requires that the table have a unique index
   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