Add URLs for:

* Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT [merge]

Add URLs for:
* Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT [merge]
b7f73bed · Bruce Momjian · 61c3e5b2 · b7f73bed · b7f73bed
隐藏空白更改
内联并排

Showing with 7 addition and 2 deletion

doc/TODO doc/TODO +4 -1

doc/src/FAQ/TODO.html doc/src/FAQ/TODO.html +3 -1

未找到文件。
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Tue Feb 20 20:08:47 EST 2007
+Last updated:		Fri Mar  2 22:08:41 EST 2007

 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -505,6 +505,9 @@ SQL Commands
  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.
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00501.php
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00536.php
+

 * Add NOVICE output level for helpful messages like automatic sequence/index
  creation

--- 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:bruce@momjian.us">bruce@momjian.us</a>)<br/>
-Last updated:           Tue Feb 20 20:08:47 EST 2007
+Last updated:           Fri Mar  2 22:08:41 EST 2007
 </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>.
@@ -454,6 +454,8 @@ first.  There is also a developer's wiki at<br/>
  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.
+  <a href="http://archives.postgresql.org/pgsql-hackers/2005-11/msg00501.php">http://archives.postgresql.org/pgsql-hackers/2005-11/msg00501.php</a>
+  <a href="http://archives.postgresql.org/pgsql-hackers/2005-11/msg00536.php">http://archives.postgresql.org/pgsql-hackers/2005-11/msg00536.php</a>
 </p>
  </li><li>Add NOVICE output level for helpful messages like automatic sequence/index
  creation