Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 915fb7f

Browse files
committed
Add MERGE TODO.detail:
> [merge] 378a380 > [merge]
1 parent f28bdd9 commit 915fb7f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

doc/TODO

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
PostgreSQL TODO List
33
====================
44
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
5-
Last updated: Thu Dec 1 17:07:44 EST 2005
5+
Last updated: Thu Dec 1 17:12:27 EST 2005
66

77
The most recent version of this document can be viewed at
88
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -370,12 +370,14 @@ SQL Commands
370370

371371
* Add a GUC variable to warn about non-standard SQL usage in queries
372372
* Add SQL-standard MERGE command, typically used to merge two tables
373+
[merge]
373374

374375
This is similar to UPDATE, then for unmatched rows, INSERT.
375376
Whether concurrent access allows modifications which could cause
376377
row loss is implementation independent.
377378

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

380382
To implement this cleanly requires that the table have a unique index
381383
so duplicate checking can be easily performed. It is possible to

doc/src/FAQ/TODO.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
99
<h1><a name="section_1">PostgreSQL TODO List</a></h1>
1010
<p>Current maintainer: Bruce Momjian (<a href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>)<br/>
11-
Last updated: Thu Dec 1 17:07:44 EST 2005
11+
Last updated: Thu Dec 1 17:12:27 EST 2005
1212
</p>
1313
<p>The most recent version of this document can be viewed at<br/>
1414
<a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a>.
@@ -340,11 +340,13 @@ <h1><a name="section_8">SQL Commands</a></h1>
340340
</p>
341341
</li><li>Add a GUC variable to warn about non-standard SQL usage in queries
342342
</li><li>Add SQL-standard MERGE command, typically used to merge two tables
343+
[<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?merge">merge</a>]
343344
<p> This is similar to UPDATE, then for unmatched rows, INSERT.
344345
Whether concurrent access allows modifications which could cause
345346
row loss is implementation independent.
346347
</p>
347348
</li><li>Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT
349+
[<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?merge">merge</a>]
348350
<p> To implement this cleanly requires that the table have a unique index
349351
so duplicate checking can be easily performed. It is possible to
350352
do it without a unique index if we require the user to LOCK the table

0 commit comments

Comments
 (0)