Add MERGE TODO.detail:

> [merge] 378a380 > [merge]

Add MERGE TODO.detail:
> [merge] 378a380 > [merge]
915fb7f6 · Bruce Momjian · f28bdd95 · 915fb7f6 · 915fb7f6
隐藏空白更改
内联并排

Showing with 6 addition and 2 deletion

doc/TODO doc/TODO +3 -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 (pgman@candle.pha.pa.us)
-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

--- 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:           Thu Dec  1 17:07:44 EST 2005
+Last updated:           Thu Dec  1 17:12:27 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>.
@@ -340,11 +340,13 @@ first.
 </p>
  </li><li>Add a GUC variable to warn about non-standard SQL usage in queries
  </li><li>Add SQL-standard MERGE command, typically used to merge two tables
+  [<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?merge">merge</a>]
 <p>  This is similar to UPDATE, then for unmatched rows, INSERT.
  Whether concurrent access allows modifications which could cause
  row loss is implementation independent.
 </p>
  </li><li>Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT
+  [<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?merge">merge</a>]
 <p>  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