Add:

> * Add MERGE command that does UPDATE, or on failure, INSERT

diff --git a/doc/TODO b/doc/TODO
index 4bea3342e2da9ddd1f908f96b00e731bc51c556e..7a2977b705ffce403152ed7afaa6a1262ae37786 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,6 @@
 TODO list for PostgreSQL
 ========================
-Last updated:      Thu May  6 15:32:03 EDT 2004
+Last updated:      Sun May  9 23:58:19 EDT 2004
 
 Current maintainer:    Bruce Momjian ([email protected])
 
@@ -187,6 +187,7 @@ Commands
 * Have pg_ctl look at PGHOST in case it is a socket directory
 * Allow column-level privileges
 * Add a session mode to warn about non-standard SQL usage
+* Add MERGE command that does UPDATE, or on failure, INSERT
 
 * ALTER
    o -ALTER TABLE ADD COLUMN does not honor DEFAULT and non-CHECK CONSTRAINT