On Thu, 2010-08-05 at 12:29 +0300, Heikki Linnakangas wrote:
> On 05/08/10 10:46, Simon Riggs wrote:
> > On Mon, 2008-04-21 at 21:08 +0100, Simon Riggs wrote:
> >> The following two files specify the behaviour of the MERGE statement and
> >> how it will work in the world of PostgreSQL.
> >
> >> The HTML file was generated from SGML source, though the latter is not
> >> included here for clarity.
> >
> > Enclose merge.sgml docs for forthcoming MERGE command, as originally
> > written.
>
> Oh, cool, I wasn't aware you had written that already. Boxuan, please
> include this in your patch, after reviewing and removing/editing
> anything that doesn't apply to your patch.
Also had these fragments as well, if they're still useful. Probably just
useful as pointers as to what else to change to include the docs.
The tests and docs were written from SQL standard, so any deviations
would need to be flagged. The idea of writing the tests first was that
they provide an objective test of whether the implementation works
according to spec.
I'd quite like a commentary on anything that needs changing. Not saying
I will necessarily object to differences, but knowing the differences
sounds important for us.
--
Simon Riggs www.2ndQuadrant.com
PostgreSQL Development, 24x7 Support, Training and Services
Index: doc/src/sgml/reference.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/reference.sgml,v
retrieving revision 1.66
diff -c -r1.66 reference.sgml
*** doc/src/sgml/reference.sgml 27 Mar 2008 17:24:16 -0000 1.66
--- doc/src/sgml/reference.sgml 18 Apr 2008 17:50:31 -0000
***************
*** 135,140 ****
--- 135,141 ----
&listen;
&load;
&lock;
+ &merge;
&move;
¬ify;
&prepare;
Index: doc/src/sgml/ref/allfiles.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/ref/allfiles.sgml,v
retrieving revision 1.73
diff -c -r1.73 allfiles.sgml
*** doc/src/sgml/ref/allfiles.sgml 27 Mar 2008 17:24:16 -0000 1.73
--- doc/src/sgml/ref/allfiles.sgml 18 Apr 2008 11:10:16 -0000
***************
*** 107,112 ****
--- 107,113 ----
<!entity listen system "listen.sgml">
<!entity load system "load.sgml">
<!entity lock system "lock.sgml">
+ <!entity merge system "merge.sgml">
<!entity move system "move.sgml">
<!entity notify system "notify.sgml">
<!entity prepare system "prepare.sgml">
Index: doc/src/sgml/ref/update.sgml
===================================================================
RCS file: /home/sriggs/pg/REPOSITORY/pgsql/doc/src/sgml/ref/update.sgml,v
retrieving revision 1.46
diff -c -r1.46 update.sgml
*** doc/src/sgml/ref/update.sgml 15 Feb 2008 22:17:06 -0000 1.46
--- doc/src/sgml/ref/update.sgml 21 Apr 2008 19:01:36 -0000
***************
*** 322,327 ****
--- 322,330 ----
-- continue with other operations, and eventually
COMMIT;
</programlisting>
+
+ This operation can be executed in a single statement using
+ <xref linkend="sql-merge" endterm="sql-merge-title">.
</para>
<para>
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
