Done:

< 	o Allow INSERT/UPDATE ... RETURNING new.col or old.col
<
< 	  This is useful for returning the auto-generated key for an INSERT.
< 	  One complication is how to handle rules that run as part of
< 	  the insert.
< 	  http://archives.postgresql.org/pgsql-patches/2005-07/msg00568.php
> 	o -Allow INSERT/UPDATE ... RETURNING new.col or old.col

diff --git a/doc/TODO b/doc/TODO
index 6ed3562cfb3c726a9f500dd802c54cb278d47de9..a2855ee616981ec80a9c9c71f02b86bcb2a4b702 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:    Bruce Momjian ([email protected])
-Last updated:      Fri Aug 11 16:17:22 EDT 2006
+Last updated:      Fri Aug 11 23:50:26 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -653,12 +653,7 @@ SQL Commands
 
    o Allow INSERT/UPDATE of the system-generated oid value for a row
    o -Allow INSERT INTO tab (col1, ..) VALUES (val1, ..), (val2, ..)
-   o Allow INSERT/UPDATE ... RETURNING new.col or old.col
-
-     This is useful for returning the auto-generated key for an INSERT.
-     One complication is how to handle rules that run as part of
-     the insert.  
-     http://archives.postgresql.org/pgsql-patches/2005-07/msg00568.php
+   o -Allow INSERT/UPDATE ... RETURNING new.col or old.col
    o In rules, allow VALUES() to contain a mixture of 'old' and 'new'
      references
 

diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 9c74172381b71550c35b5cc432ee7ee5b52f9534..c56b54d77a8b02bfbc477054b59f38f258147ed5 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:           Fri Aug 11 16:17:22 EDT 2006
+Last updated:           Fri Aug 11 23:50:26 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -591,15 +591,11 @@ first.
   
     Allow INSERT/UPDATE of the system-generated oid value for a row
     -Allow INSERT INTO tab (col1, ..) VALUES (val1, ..), (val2, ..)
-    Allow INSERT/UPDATE ... RETURNING new.col or old.col
-          This is useful for returning the auto-generated key for an INSERT.
-          One complication is how to handle rules that run as part of
-          the insert.  
-          http://archives.postgresql.org/pgsql-patches/2005-07/msg00568.php
-    In rules, allow VALUES() to contain a mixture of 'old' and 'new'
+    -Allow INSERT/UPDATE ... RETURNING new.col or old.col
+    In rules, allow VALUES() to contain a mixture of 'old' and 'new'
           references
   
-  SHOW/SET
+  </li><li>SHOW/SET
   
     Add SET PERFORMANCE_TIPS option to suggest INDEX, VACUUM, VACUUM
           ANALYZE, and CLUSTER
@@ -677,7 +673,7 @@ first.
     
   
 
-</p><h1>Clients
+Clients
 
 
   -Have initdb set the input DateStyle (MDY or DMY) based on locale
@@ -1337,6 +1333,6 @@ first.
   Teodor is Teodor Sigaev <[email protected]>
   Tom is Tom Lane <[email protected]> of Red Hat
 
-
+